Skip to content

Commit 21c0520

Browse files
committed
ci : E2E tests should also run on GitHub MacOS runners
+ Enable E2E tests to run on GitHub MacOS runners + Use `crazy-max/ghaction-setup-docker` action to set up docker on MacOS Signed-off-by: Rohan Kumar <[email protected]>
1 parent 3c1cf3f commit 21c0520

File tree

3 files changed

+42
-4
lines changed

3 files changed

+42
-4
lines changed

.github/workflows/e2e-tests.yml

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ jobs:
3636
- name: Install DMP
3737
run: mvn ${MAVEN_ARGS} clean install -DskipTests -Djacoco.skip=true
3838

39-
build:
40-
name: Docker ${{ matrix.docker }} on Linux
39+
linux-build:
40+
name: Linux
4141
runs-on: ubuntu-latest
4242
needs: buildWithoutTests
4343
strategy:
4444
fail-fast: false
4545
matrix:
46-
docker: [v25.0.2, v24.0.9, v23.0.6]
46+
docker: [v25.0.2, v24.0.9, v23.0.6, v20.10.24]
4747
steps:
4848
- name: Checkout
4949
uses: actions/checkout@v2
@@ -62,5 +62,42 @@ jobs:
6262
version: ${{ matrix.docker }}
6363
- name: Run Integration tests
6464
run: |
65+
# Workaround for https://github.com/docker/for-linux/issues/748
66+
DOCKER_INSTALL_PATH=`which docker`
67+
sudo cp $DOCKER_INSTALL_PATH-init /sbin/docker-init
68+
cd it/
69+
mvn clean install
70+
macos-build:
71+
name: MacOS
72+
needs: buildWithoutTests
73+
runs-on: macos-13
74+
strategy:
75+
fail-fast: false
76+
matrix:
77+
docker: [v25.0.2,v24.0.9,v23.0.6,v20.10.24]
78+
steps:
79+
- name: Checkout
80+
uses: actions/checkout@v2
81+
- name: Setup Java
82+
uses: actions/setup-java@v1
83+
with:
84+
java-version: '11'
85+
- name: Cache .m2 registry
86+
uses: actions/cache@v4
87+
with:
88+
path: ~/.m2/repository
89+
key: cache-e2e-${{ github.sha }}-${{ github.run_id }}
90+
- name: Set up Docker
91+
uses: crazy-max/ghaction-setup-docker@v2
92+
with:
93+
version: ${{ matrix.docker }}
94+
- name: Set up Docker Buildx
95+
run: |
96+
brew install docker-buildx
97+
mkdir -p ~/.docker/cli-plugins
98+
ln -sfn /usr/local/opt/docker-buildx/bin/docker-buildx ~/.docker/cli-plugins/docker-buildx
99+
- name: Run Integration tests
100+
run: |
101+
export DOCKER_HOST=unix:///Users/runner/.colima/default/docker.sock
65102
cd it/
66103
mvn clean install

.github/workflows/e2e-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: E2E Tests
1+
name: E2E Windows
22

33
env:
44
MAVEN_ARGS: -B -C -V -ntp -Dhttp.keepAlive=false -e

it/multi-assembly/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
<run>
9898
<wait>
9999
<log>Hello from Spring Boot!</log>
100+
<time>30000</time>
100101
</wait>
101102
</run>
102103
</image>

0 commit comments

Comments
 (0)