diff --git a/.github/workflows/release-kpi-tracker.yml b/.github/workflows/release-kpi-tracker.yml index 081dae71..6b73d19e 100644 --- a/.github/workflows/release-kpi-tracker.yml +++ b/.github/workflows/release-kpi-tracker.yml @@ -5,9 +5,12 @@ on: tags: - kpi-tracker/*.*.* + workflow_dispatch: + env: REGISTRY: docker.io - IMAGE_NAME: kpi-tracker + SERVICE_NAME: kpi-tracker + RUST_VERSION: rust:1.76-buster jobs: publish-docker-image: @@ -28,14 +31,14 @@ jobs: - name: Extract version tag from Cargo.toml manifest. id: meta run: | - export VERSION=$(yq .package.version kpi-tracker/Cargo.toml) - export FULL_IMAGE_TAG="${{ env.REGISTRY }}/concordium/$IMAGE_NAME:$VERSION" + export VERSION=$(yq .package.version ${{ env.SERVICE_NAME }}/Cargo.toml) + export FULL_IMAGE_TAG="${{ env.REGISTRY }}/concordium/${{ env.SERVICE_NAME }}:$VERSION" echo "::notice FULL_IMAGE_TAG=${FULL_IMAGE_TAG}" # Make sure the image does not exist. Abort if we can retrieve any metadata. if docker manifest inspect ${FULL_IMAGE_TAG} > /dev/null; then echo "::error ${FULL_IMAGE_TAG} already exists" exit 1 - elif [ ! "${{ github.ref_name }}" = "kpi-tracker/${VERSION}" ]; then + elif [ ! "${{ github.ref_name }}" = "${{ env.SERVICE_NAME }}/${VERSION}" ]; then echo "::error Expected tag ${EXPECTED_TAG} does not match the version ${VERSION}." exit 1 else @@ -46,7 +49,7 @@ jobs: uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4 with: context: . - file: ./kpi-tracker/scripts/Dockerfile + file: ./${{ SERVICE_NAME }}/scripts/Dockerfile push: true platforms: linux/amd64 tags: ${{ steps.meta.outputs.tag }} diff --git a/deps/concordium-rust-sdk b/deps/concordium-rust-sdk index 1e983721..74530877 160000 --- a/deps/concordium-rust-sdk +++ b/deps/concordium-rust-sdk @@ -1 +1 @@ -Subproject commit 1e983721de4472ca85345c895dac3e3135cf687b +Subproject commit 74530877b05a4734f8047b74744e1d6d07c68688 diff --git a/kpi-tracker/Cargo.lock b/kpi-tracker/Cargo.lock index a813a5de..c96aa0b8 100644 --- a/kpi-tracker/Cargo.lock +++ b/kpi-tracker/Cargo.lock @@ -633,7 +633,7 @@ dependencies = [ [[package]] name = "concordium-kpi-tracker" -version = "2.1.0" +version = "2.1.1" dependencies = [ "anyhow", "chrono", diff --git a/kpi-tracker/Cargo.toml b/kpi-tracker/Cargo.toml index 67ab146b..ba1ac4f9 100644 --- a/kpi-tracker/Cargo.toml +++ b/kpi-tracker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "concordium-kpi-tracker" -version = "2.1.0" +version = "2.1.1" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html