From 0e834a6a296c499bc67ff7033ac536b22280d965 Mon Sep 17 00:00:00 2001 From: Nicolas Belouin Date: Thu, 16 Nov 2023 11:25:54 +0100 Subject: [PATCH] Fix build issues (#676) * Fix small errors in onvif broker and opencv base build workflows Signed-off-by: Nicolas Belouin * Use correct credentials to push images Signed-off-by: Nicolas Belouin * Update patch version Signed-off-by: Nicolas Belouin * fix OpenCV workflow triggers Signed-off-by: Nicolas Belouin --------- Signed-off-by: Nicolas Belouin --- .../build-onvif-video-broker-container.yml | 7 +++-- ...uild-opcua-monitoring-broker-container.yml | 5 ++-- .../workflows/build-opencv-base-container.yml | 11 +++----- .../workflows/build-python-app-containers.yml | 9 +++--- .github/workflows/build-rust-containers.yml | 17 ++++++++--- Cargo.lock | 28 +++++++++---------- agent/Cargo.toml | 2 +- build/intermediate-containers.mk | 2 +- controller/Cargo.toml | 2 +- deployment/helm/Chart.yaml | 4 +-- .../debug-echo-discovery-handler/Cargo.toml | 2 +- .../onvif-discovery-handler/Cargo.toml | 2 +- .../opcua-discovery-handler/Cargo.toml | 2 +- .../udev-discovery-handler/Cargo.toml | 2 +- discovery-handlers/debug-echo/Cargo.toml | 2 +- discovery-handlers/onvif/Cargo.toml | 2 +- discovery-handlers/opcua/Cargo.toml | 2 +- discovery-handlers/udev/Cargo.toml | 2 +- discovery-utils/Cargo.toml | 2 +- samples/brokers/udev-video-broker/Cargo.toml | 2 +- shared/Cargo.toml | 2 +- version.txt | 2 +- webhooks/validating/configuration/Cargo.toml | 2 +- 23 files changed, 61 insertions(+), 52 deletions(-) diff --git a/.github/workflows/build-onvif-video-broker-container.yml b/.github/workflows/build-onvif-video-broker-container.yml index 524636e26..649a6b5dd 100644 --- a/.github/workflows/build-onvif-video-broker-container.yml +++ b/.github/workflows/build-onvif-video-broker-container.yml @@ -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 - 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") diff --git a/.github/workflows/build-opcua-monitoring-broker-container.yml b/.github/workflows/build-opcua-monitoring-broker-container.yml index f2c15cd1a..a087f6257 100644 --- a/.github/workflows/build-opcua-monitoring-broker-container.yml +++ b/.github/workflows/build-opcua-monitoring-broker-container.yml @@ -42,11 +42,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 diff --git a/.github/workflows/build-opencv-base-container.yml b/.github/workflows/build-opencv-base-container.yml index 2da22edb0..3d779a087 100644 --- a/.github/workflows/build-opencv-base-container.yml +++ b/.github/workflows/build-opencv-base-container.yml @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/build-python-app-containers.yml b/.github/workflows/build-python-app-containers.yml index b67b5cf94..545e305d9 100644 --- a/.github/workflows/build-python-app-containers.yml +++ b/.github/workflows/build-python-app-containers.yml @@ -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 @@ -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 diff --git a/.github/workflows/build-rust-containers.yml b/.github/workflows/build-rust-containers.yml index 30cb77bdd..d5559af6a 100644 --- a/.github/workflows/build-rust-containers.yml +++ b/.github/workflows/build-rust-containers.yml @@ -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' @@ -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' @@ -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 @@ -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 diff --git a/Cargo.lock b/Cargo.lock index 3fbd6c4d7..d10fc167e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -298,7 +298,7 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "agent" -version = "0.12.16" +version = "0.12.17" dependencies = [ "akri-debug-echo", "akri-discovery-utils", @@ -358,7 +358,7 @@ dependencies = [ [[package]] name = "akri-debug-echo" -version = "0.12.16" +version = "0.12.17" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -376,7 +376,7 @@ dependencies = [ [[package]] name = "akri-discovery-utils" -version = "0.12.16" +version = "0.12.17" dependencies = [ "akri-shared", "anyhow", @@ -398,7 +398,7 @@ dependencies = [ [[package]] name = "akri-onvif" -version = "0.12.16" +version = "0.12.17" dependencies = [ "akri-discovery-utils", "anyhow", @@ -427,7 +427,7 @@ dependencies = [ [[package]] name = "akri-opcua" -version = "0.12.16" +version = "0.12.17" dependencies = [ "akri-discovery-utils", "anyhow", @@ -446,7 +446,7 @@ dependencies = [ [[package]] name = "akri-shared" -version = "0.12.16" +version = "0.12.17" dependencies = [ "anyhow", "async-trait", @@ -471,7 +471,7 @@ dependencies = [ [[package]] name = "akri-udev" -version = "0.12.16" +version = "0.12.17" dependencies = [ "akri-discovery-utils", "anyhow", @@ -986,7 +986,7 @@ checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" [[package]] name = "controller" -version = "0.12.16" +version = "0.12.17" dependencies = [ "akri-shared", "anyhow", @@ -1178,7 +1178,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "debug-echo-discovery-handler" -version = "0.12.16" +version = "0.12.17" dependencies = [ "akri-debug-echo", "akri-discovery-utils", @@ -2479,7 +2479,7 @@ checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "onvif-discovery-handler" -version = "0.12.16" +version = "0.12.17" dependencies = [ "akri-discovery-utils", "akri-onvif", @@ -2529,7 +2529,7 @@ dependencies = [ [[package]] name = "opcua-discovery-handler" -version = "0.12.16" +version = "0.12.17" dependencies = [ "akri-discovery-utils", "akri-opcua", @@ -4134,7 +4134,7 @@ dependencies = [ [[package]] name = "udev-discovery-handler" -version = "0.12.16" +version = "0.12.17" dependencies = [ "akri-discovery-utils", "akri-udev", @@ -4145,7 +4145,7 @@ dependencies = [ [[package]] name = "udev-video-broker" -version = "0.12.16" +version = "0.12.17" dependencies = [ "akri-shared", "env_logger", @@ -4422,7 +4422,7 @@ dependencies = [ [[package]] name = "webhook-configuration" -version = "0.12.16" +version = "0.12.17" dependencies = [ "actix-rt 2.7.0", "actix-web", diff --git a/agent/Cargo.toml b/agent/Cargo.toml index ecc26375d..308cc0d5b 100644 --- a/agent/Cargo.toml +++ b/agent/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "agent" -version = "0.12.16" +version = "0.12.17" license = "Apache-2.0" authors = ["Kate Goldenring ", ""] edition = "2018" diff --git a/build/intermediate-containers.mk b/build/intermediate-containers.mk index 2ae108093..466daafe3 100644 --- a/build/intermediate-containers.mk +++ b/build/intermediate-containers.mk @@ -1,4 +1,4 @@ -BUILD_OPENCV_BASE_VERSION = 0.1.0 +BUILD_OPENCV_BASE_VERSION = 0.1.1 # # diff --git a/controller/Cargo.toml b/controller/Cargo.toml index 858fda08e..3ad91db61 100644 --- a/controller/Cargo.toml +++ b/controller/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "controller" -version = "0.12.16" +version = "0.12.17" license = "Apache-2.0" authors = ["", ""] edition = "2018" diff --git a/deployment/helm/Chart.yaml b/deployment/helm/Chart.yaml index 4eed73b0c..5f4204f87 100644 --- a/deployment/helm/Chart.yaml +++ b/deployment/helm/Chart.yaml @@ -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 diff --git a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml index 4a36d6a38..b3088c828 100644 --- a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml @@ -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 "] edition = "2018" diff --git a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml index 42d381202..d762bf39f 100644 --- a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "onvif-discovery-handler" -version = "0.12.16" +version = "0.12.17" license = "Apache-2.0" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml index cc9812939..810d95338 100644 --- a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opcua-discovery-handler" -version = "0.12.16" +version = "0.12.17" license = "Apache-2.0" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handler-modules/udev-discovery-handler/Cargo.toml b/discovery-handler-modules/udev-discovery-handler/Cargo.toml index 022bfc0a5..ee87916dc 100644 --- a/discovery-handler-modules/udev-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/udev-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "udev-discovery-handler" -version = "0.12.16" +version = "0.12.17" license = "Apache-2.0" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handlers/debug-echo/Cargo.toml b/discovery-handlers/debug-echo/Cargo.toml index 59271ba1a..ab7ba3fd1 100644 --- a/discovery-handlers/debug-echo/Cargo.toml +++ b/discovery-handlers/debug-echo/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-debug-echo" -version = "0.12.16" +version = "0.12.17" license = "Apache-2.0" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handlers/onvif/Cargo.toml b/discovery-handlers/onvif/Cargo.toml index 19553cb5c..638925806 100644 --- a/discovery-handlers/onvif/Cargo.toml +++ b/discovery-handlers/onvif/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-onvif" -version = "0.12.16" +version = "0.12.17" license = "Apache-2.0" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handlers/opcua/Cargo.toml b/discovery-handlers/opcua/Cargo.toml index ec7a10cff..1d834683e 100644 --- a/discovery-handlers/opcua/Cargo.toml +++ b/discovery-handlers/opcua/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-opcua" -version = "0.12.16" +version = "0.12.17" license = "Apache-2.0" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handlers/udev/Cargo.toml b/discovery-handlers/udev/Cargo.toml index 821fbfeb1..c1accad86 100644 --- a/discovery-handlers/udev/Cargo.toml +++ b/discovery-handlers/udev/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-udev" -version = "0.12.16" +version = "0.12.17" license = "Apache-2.0" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-utils/Cargo.toml b/discovery-utils/Cargo.toml index ead72a75a..2813719ae 100644 --- a/discovery-utils/Cargo.toml +++ b/discovery-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-discovery-utils" -version = "0.12.16" +version = "0.12.17" license = "Apache-2.0" authors = ["Kate Goldenring "] edition = "2018" diff --git a/samples/brokers/udev-video-broker/Cargo.toml b/samples/brokers/udev-video-broker/Cargo.toml index 99cbe8865..3b46aeb4f 100644 --- a/samples/brokers/udev-video-broker/Cargo.toml +++ b/samples/brokers/udev-video-broker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "udev-video-broker" -version = "0.12.16" +version = "0.12.17" license = "Apache-2.0" authors = ["Kate Goldenring ", ""] edition = "2018" diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 43e12bdca..bbc459155 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-shared" -version = "0.12.16" +version = "0.12.17" license = "Apache-2.0" authors = [""] edition = "2018" diff --git a/version.txt b/version.txt index bcc7c361e..e392c3dc0 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.12.16 +0.12.17 diff --git a/webhooks/validating/configuration/Cargo.toml b/webhooks/validating/configuration/Cargo.toml index 067e23d51..3f5385a65 100644 --- a/webhooks/validating/configuration/Cargo.toml +++ b/webhooks/validating/configuration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "webhook-configuration" -version = "0.12.16" +version = "0.12.17" license = "Apache-2.0" authors = ["DazWilkin "] edition = "2018"