Merge pull request #385 from privacybydesign/fix-docker-compose

CI/CD: fix docker-compose not being available in default GH Actions r…
privacybydesign · Aug 7, 2024 · fbb506e · fbb506e
2 parents e3dd814 + 56cf18a
commit fbb506e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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.

diff --git 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`