Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build issues #676

Merged
merged 4 commits into from
Nov 16, 2023
Merged

Fix build issues #676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f66350
Fix small errors in onvif broker and opencv base build workflows
diconico07 Oct 27, 2023
05737e3
Use correct credentials to push images
diconico07 Oct 27, 2023
7351bee
Update patch version
diconico07 Oct 27, 2023
14f50da
fix OpenCV workflow triggers
diconico07 Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/build-onvif-video-broker-container.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,14 @@ jobs:
uses: docker/setup-buildx-action@v3

- name: Login to GitHub Container Registry
if: github.event_name == 'push' || github.event_name == 'release'
uses: docker/login-action@v3
with:
registry: ghcr.io
kate-goldenring marked this conversation as resolved.
Show resolved Hide resolved
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
username: ${{ secrets.crUsername }}
password: ${{ secrets.crPassword }}

- name: Build and push
run: |
make onvif-video-broker $(${{ github.event_name != 'pull_request' }} && echo "PUSH=1")
make onvif-video-broker PREFIX=ghcr.io/project-akri/akri $(${{ github.event_name != 'pull_request' }} && echo "PUSH=1")

5 changes: 3 additions & 2 deletions .github/workflows/build-opcua-monitoring-broker-container.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,12 @@ jobs:
uses: docker/setup-buildx-action@v3

- name: Login to GitHub Container Registry
kate-goldenring marked this conversation as resolved.
Show resolved Hide resolved
if: github.event_name == 'push' || github.event_name == 'release'
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
username: ${{ secrets.crUsername }}
password: ${{ secrets.crPassword }}

- name: Docker meta
uses: docker/metadata-action@v5
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/build-opencv-base-container.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
push:
branches: [ main ]
paths:
- .github/actions/build-intermediate/**
- .github/workflows/build-opencv-base-container.yml
- build/containers/intermediate/Dockerfile.opencvsharp-build
- build/intermediate-containers.mk
Expand All @@ -13,13 +12,10 @@ on:
types: [opened, synchronize, reopened, labeled]
branches: [ main ]
paths:
- .github/actions/build-intermediate/**
- .github/workflows/build-opencv-base-container.yml
- build/containers/intermediate/Dockerfile.opencvsharp-build
- build/intermediate-containers.mk
- Makefile
issue_comment:
types: [created, edited]

env:
AKRI_COMPONENT: opencvsharp-build
Expand Down Expand Up @@ -57,11 +53,12 @@ jobs:
uses: docker/setup-buildx-action@v3

- name: Login to GitHub Container Registry
if: github.event_name == 'push' || github.event_name == 'release'
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
username: ${{ secrets.crUsername }}
password: ${{ secrets.crPassword }}

- name: Docker meta
uses: docker/metadata-action@v5
Expand All @@ -73,7 +70,7 @@ jobs:
org.opencontainers.image.description=Akri opencvsharp base image for samples build
tags: |
type=ref,event=pr
type=raw,value=${{steps.version-string.outputs.version}}
type=raw,value=${{steps.version-string.outputs.BUILD_OPENCV_BASE_VERSION}}

- name: Build and push
uses: docker/build-push-action@v5
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/build-python-app-containers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ on:
push:
branches: [ main ]
paths:
- .github/workflows/build-python-app-container.yml
- .github/workflows/build-python-app-containers.yml
- build/containers/Dockerfile.python-app
- samples/apps/**
- version.txt
pull_request:
branches: [ main ]
paths:
- .github/workflows/build-python-app-container.yml
- .github/workflows/build-python-app-containers.yml
- build/containers/Dockerfile.python-app
- samples/apps/**
- version.txt
Expand Down Expand Up @@ -47,11 +47,12 @@ jobs:
uses: docker/setup-buildx-action@v3

- name: Login to GitHub Container Registry
if: github.event_name == 'push' || github.event_name == 'release'
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
username: ${{ secrets.crUsername }}
password: ${{ secrets.crPassword }}

- name: Docker meta
uses: docker/metadata-action@v5
Expand Down
17 changes: 13 additions & 4 deletions .github/workflows/build-rust-containers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [ main ]
paths:
- .github/workflows/build-rust-code.yml
- .github/workflows/build-rust-containers.yml
- build/containers/Dockerfile.rust
- '**.rs'
- '**/Cargo.toml'
Expand All @@ -13,7 +13,7 @@ on:
pull_request:
branches: [ main ]
paths:
- .github/workflows/build-rust-code.yml
- .github/workflows/build-rust-containers.yml
- build/containers/Dockerfile.rust
- '**.rs'
- '**/Cargo.toml'
Expand Down Expand Up @@ -60,11 +60,12 @@ jobs:
uses: docker/setup-buildx-action@v3

- name: Login to GitHub Container Registry
if: github.event_name == 'push' || github.event_name == 'release'
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
username: ${{ secrets.crUsername }}
password: ${{ secrets.crPassword }}

- name: Docker meta
uses: docker/metadata-action@v5
Expand Down Expand Up @@ -138,6 +139,14 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to GitHub Container Registry
if: github.event_name == 'push' || github.event_name == 'release'
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ secrets.crUsername }}
password: ${{ secrets.crPassword }}

- name: Docker meta
uses: docker/metadata-action@v5
id: meta
Expand Down
28 changes: 14 additions & 14 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion agent/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "agent"
version = "0.12.16"
version = "0.12.17"
license = "Apache-2.0"
authors = ["Kate Goldenring <[email protected]>", "<[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion build/intermediate-containers.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
BUILD_OPENCV_BASE_VERSION = 0.1.0
BUILD_OPENCV_BASE_VERSION = 0.1.1

#
#
Expand Down
2 changes: 1 addition & 1 deletion controller/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "controller"
version = "0.12.16"
version = "0.12.17"
license = "Apache-2.0"
authors = ["<[email protected]>", "<[email protected]>"]
edition = "2018"
Expand Down
4 changes: 2 additions & 2 deletions deployment/helm/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.12.16
version: 0.12.17

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 0.12.16
appVersion: 0.12.17
2 changes: 1 addition & 1 deletion discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "debug-echo-discovery-handler"
version = "0.12.16"
version = "0.12.17"
license = "Apache-2.0"
authors = ["Kate Goldenring <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion discovery-handler-modules/onvif-discovery-handler/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "onvif-discovery-handler"
version = "0.12.16"
version = "0.12.17"
license = "Apache-2.0"
authors = ["Kate Goldenring <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion discovery-handler-modules/opcua-discovery-handler/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "opcua-discovery-handler"
version = "0.12.16"
version = "0.12.17"
license = "Apache-2.0"
authors = ["Kate Goldenring <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion discovery-handler-modules/udev-discovery-handler/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "udev-discovery-handler"
version = "0.12.16"
version = "0.12.17"
license = "Apache-2.0"
authors = ["Kate Goldenring <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion discovery-handlers/debug-echo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "akri-debug-echo"
version = "0.12.16"
version = "0.12.17"
license = "Apache-2.0"
authors = ["Kate Goldenring <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion discovery-handlers/onvif/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "akri-onvif"
version = "0.12.16"
version = "0.12.17"
license = "Apache-2.0"
authors = ["Kate Goldenring <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion discovery-handlers/opcua/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "akri-opcua"
version = "0.12.16"
version = "0.12.17"
license = "Apache-2.0"
authors = ["Kate Goldenring <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion discovery-handlers/udev/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "akri-udev"
version = "0.12.16"
version = "0.12.17"
license = "Apache-2.0"
authors = ["Kate Goldenring <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion discovery-utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "akri-discovery-utils"
version = "0.12.16"
version = "0.12.17"
license = "Apache-2.0"
authors = ["Kate Goldenring <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion samples/brokers/udev-video-broker/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "udev-video-broker"
version = "0.12.16"
version = "0.12.17"
license = "Apache-2.0"
authors = ["Kate Goldenring <[email protected]>", "<[email protected]>"]
edition = "2018"
Expand Down
Loading