From 5d2aeb811612c3f15192fca47c3e0e7d2101435a Mon Sep 17 00:00:00 2001 From: Naian <126972030+nain-F49FF806@users.noreply.github.com> Date: Wed, 25 Dec 2024 14:52:03 +0000 Subject: [PATCH 1/3] fix: use fixed version of sqlx-cli and it's Cargo.lock Signed-off-by: Naian <126972030+nain-F49FF806@users.noreply.github.com> --- .github/workflows/mediator.pr.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/mediator.pr.yml b/.github/workflows/mediator.pr.yml index 8558373cb9..c2f2a4ec32 100644 --- a/.github/workflows/mediator.pr.yml +++ b/.github/workflows/mediator.pr.yml @@ -8,7 +8,7 @@ on: branches: - "**" paths: - - 'aries/agents/mediator/**' + - "aries/agents/mediator/**" env: DOCKER_BUILDKIT: 1 @@ -17,7 +17,6 @@ env: RUST_TOOLCHAIN_VERSION: 1.79.0 jobs: - setup-variables: runs-on: ubuntu-22.04 outputs: @@ -51,7 +50,7 @@ jobs: echo "SKIP_CI ${{ needs.setup-variables.outputs.SKIP_CI }}" test-integration-mediator: - needs: [ setup-variables ] + needs: [setup-variables] if: ${{ needs.setup-variables.outputs.SKIP_CI != 'true' }} runs-on: ubuntu-22.04 services: @@ -63,7 +62,7 @@ jobs: MYSQL_PASSWORD: github.ci.password.no.prod MYSQL_ROOT_PASSWORD: github.ci.password.no.prod ports: - - '3326:3306' + - "3326:3306" env: MYSQL_URL: mysql://admin:github.ci.password.no.prod@localhost:3326/mediator-persistence.mysql steps: @@ -77,7 +76,7 @@ jobs: skip-vdrproxy-setup: true - name: Install prerequisites (sqlx) # uses: Swatinem/rust-cache@v2 - run: cargo install sqlx-cli + run: cargo install sqlx-cli@0.8.2 --locked - name: Setup database run: DATABASE_URL=${MYSQL_URL} sqlx migrate run --source aries/agents/mediator/migrations - name: "Run mediator integration tests" @@ -89,7 +88,7 @@ jobs: name: "docker-services-${{ github.job }}" docker-mediator-build: - needs: [ test-integration-mediator, setup-variables ] + needs: [test-integration-mediator, setup-variables] if: ${{ needs.setup-variables.outputs.SKIP_CI != 'true' }} runs-on: ubuntu-22.04 env: @@ -120,4 +119,4 @@ jobs: docker-img: ${{ env.DOCKER_IMAGE }} publish-version: ${{ needs.setup-variables.outputs.PUBLISH_VERSION }} env: - URL_DOCKER_REGISTRY: ghcr.io # Required by .github/actions/publish-image + URL_DOCKER_REGISTRY: ghcr.io # Required by .github/actions/publish-image From 0b541a098151634a04248dd98250da2702fb2961 Mon Sep 17 00:00:00 2001 From: Naian <126972030+nain-F49FF806@users.noreply.github.com> Date: Wed, 25 Dec 2024 15:01:37 +0000 Subject: [PATCH 2/3] rerun ci on workflow change Signed-off-by: Naian <126972030+nain-F49FF806@users.noreply.github.com> --- .github/workflows/mediator.pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/mediator.pr.yml b/.github/workflows/mediator.pr.yml index c2f2a4ec32..a144d43126 100644 --- a/.github/workflows/mediator.pr.yml +++ b/.github/workflows/mediator.pr.yml @@ -9,6 +9,7 @@ on: - "**" paths: - "aries/agents/mediator/**" + - ".github/workflows/mediator.pr.yml" env: DOCKER_BUILDKIT: 1 From e90acd2d5ff768c0b19024449859b920c1d585ac Mon Sep 17 00:00:00 2001 From: Naian <126972030+nain-F49FF806@users.noreply.github.com> Date: Wed, 25 Dec 2024 15:21:44 +0000 Subject: [PATCH 3/3] fix: use mediator lock file some dependencies have increased minimum supported rust version (msrv). This causes breakage as we use an earlier 1.79 Use the lockfile to use versions of dependencies known to work. Signed-off-by: Naian <126972030+nain-F49FF806@users.noreply.github.com> --- aries/agents/mediator/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aries/agents/mediator/Dockerfile b/aries/agents/mediator/Dockerfile index c14991c19f..0251e9d190 100644 --- a/aries/agents/mediator/Dockerfile +++ b/aries/agents/mediator/Dockerfile @@ -7,7 +7,7 @@ RUN ls -lahF RUN --mount=type=cache,target=./target \ --mount=type=cache,target=${CARGO_HOME}/git \ --mount=type=cache,target=${CARGO_HOME}/registry \ - cargo install --no-default-features --path=./aries/agents/mediator/ --bin mediator + cargo install --no-default-features --path=./aries/agents/mediator/ --bin mediator --locked FROM debian:bookworm-slim as mediator RUN apt update && apt install -y libsodium23 libzmq5 && rm -rf /var/lib/apt/lists/*