Skip to content

Commit

Permalink
Tests: also run integration tests on macos runners
Browse files Browse the repository at this point in the history
To ensure that developer environment stays working on macos
  • Loading branch information
Radu Carpa committed Oct 20, 2023
1 parent b205d25 commit b97d252
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
14 changes: 12 additions & 2 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
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
Expand Down
2 changes: 1 addition & 1 deletion etc/docker/dev/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3"
version: "3.4"
services:
rucioclient:
image: docker.io/rucio/rucio-dev:latest-alma9
Expand Down

0 comments on commit b97d252

Please sign in to comment.