diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 637f51d74bb..f88fc0c739e 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -25,11 +25,14 @@ jobs: integration-tests: needs: setup - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: cfg: ${{ fromJson(needs.setup.outputs.matrix) }} + os: + - ubuntu-latest + - macos-latest steps: - name: Checkout rucio containers repository uses: actions/checkout@v2 @@ -89,10 +92,17 @@ jobs: echo "Tag $GIT_REF not found in rucio/containers. Integration test containers will be built against the master branch instead." git checkout master fi + - name: Setup docker (missing on MacOS) + if: runner.os == 'macos' + run: | + brew install docker-compose + colima start - name: Use rucio/containers Dockerfile for integration tests shell: bash run: | - sed -i 's;RUN git clone .*;COPY ./rucio /tmp/rucio;' $GITHUB_WORKSPACE/dev/alma9.Dockerfile + OUTPUT_FILE=$(mktemp) + sed 's;RUN git clone .*;COPY ./rucio /tmp/rucio;' $GITHUB_WORKSPACE/dev/alma9.Dockerfile > "$OUTPUT_FILE" + mv "$OUTPUT_FILE" $GITHUB_WORKSPACE/dev/alma9.Dockerfile - name: Build rucio-dev images id: images shell: bash diff --git a/etc/docker/dev/docker-compose.yml b/etc/docker/dev/docker-compose.yml index c6324fa0040..50c26c96c4f 100644 --- a/etc/docker/dev/docker-compose.yml +++ b/etc/docker/dev/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: "3.4" services: rucioclient: image: docker.io/rucio/rucio-dev:latest-alma9