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

(fix) Use fixed version (Cargo.lock) of sqlx-cli and mediator binary for mediator-ci #1319

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

(fix) Use fixed version (Cargo.lock) of sqlx-cli and mediator binary for mediator-ci #1319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d2aeb8
fix: use fixed version of sqlx-cli and it's Cargo.lock
nain-F49FF806 Dec 25, 2024
0b541a0
rerun ci on workflow change
nain-F49FF806 Dec 25, 2024
e90acd2
fix: use mediator lock file
nain-F49FF806 Dec 25, 2024
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
14 changes: 7 additions & 7 deletions .github/workflows/mediator.pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
branches:
- "**"
paths:
- 'aries/agents/mediator/**'
- "aries/agents/mediator/**"
- ".github/workflows/mediator.pr.yml"

env:
DOCKER_BUILDKIT: 1
Expand All @@ -17,7 +18,6 @@ env:
RUST_TOOLCHAIN_VERSION: 1.79.0

jobs:

setup-variables:
runs-on: ubuntu-22.04
outputs:
Expand Down Expand Up @@ -51,7 +51,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:
Expand All @@ -63,7 +63,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:
Expand All @@ -77,7 +77,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"
Expand All @@ -89,7 +89,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:
Expand Down Expand Up @@ -120,4 +120,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
2 changes: 1 addition & 1 deletion aries/agents/mediator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
Expand Down
Loading