From 19e706cf0d597ac17811bafc1c61966c5ce5c9f9 Mon Sep 17 00:00:00 2001 From: Ivar Derksen Date: Mon, 5 Aug 2024 14:37:48 +0000 Subject: [PATCH 1/2] CI/CD: fix docker-compose not being available in default GH Actions runner image --- .github/actions/integration-test/action.yml | 2 +- .github/workflows/status-checks.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/integration-test/action.yml b/.github/actions/integration-test/action.yml index 12ce0610..cd71dc43 100644 --- a/.github/actions/integration-test/action.yml +++ b/.github/actions/integration-test/action.yml @@ -51,7 +51,7 @@ runs: shell: bash - name: Run keyshare server utilities - run: docker-compose up -d + run: docker compose up -d shell: bash # We add & at the end of each command to run them in the background. diff --git a/.github/workflows/status-checks.yml b/.github/workflows/status-checks.yml index 151b00fa..dd330a0c 100644 --- a/.github/workflows/status-checks.yml +++ b/.github/workflows/status-checks.yml @@ -94,7 +94,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Run all unit tests - run: docker-compose run test -v ./... + run: docker compose run test -v ./... # The integration tests are split into two jobs, one for the client side and one for the server side. # They test whether irmago versions with different versions of gabi can interact. From 56cf18aac4d740f253a277bd6da5f8eeb4a063b4 Mon Sep 17 00:00:00 2001 From: Ivar Derksen Date: Mon, 5 Aug 2024 14:41:35 +0000 Subject: [PATCH 2/2] Chore: update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d449941c..14038607 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +### Internal +- Fix docker-compose not being available for test jobs in default GH Actions runner image + ## [0.16.0] - 2024-07-17 ### Added - Option to configure client mtls redis cert and key for `irma server`, `irma keyshare server` and `irma keyshare myirmaserver`