Skip to content

Commit

Permalink
ci : fix failing sonar and E2E macOS github action workflows
Browse files Browse the repository at this point in the history
+ Add same version of sonar-maven-plugin as used in jkube
+ Use v3 version of setup-docker github action in e2e macOS pipelines,
  add workaround for failing jobs in QEMU 9.1.0

Signed-off-by: Rohan Kumar <[email protected]>
  • Loading branch information
rohanKanojia committed Nov 23, 2024
1 parent 76f4aee commit 769a250
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
path: ~/.m2/repository
key: cache-e2e-${{ github.sha }}-${{ github.run_id }}
- name: Set up Docker
uses: crazy-max/ghaction-setup-docker@v2
uses: crazy-max/ghaction-setup-docker@v3
with:
version: ${{ matrix.docker }}
- name: Run Integration tests
Expand Down Expand Up @@ -87,8 +87,11 @@ jobs:
with:
path: ~/.m2/repository
key: cache-e2e-${{ github.sha }}-${{ github.run_id }}
- # https://github.com/crazy-max/ghaction-setup-docker/issues/108
name: Install QEMU 9.0.2
uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
- name: Set up Docker
uses: crazy-max/ghaction-setup-docker@v2
uses: crazy-max/ghaction-setup-docker@v3
with:
version: ${{ matrix.docker }}
- name: Set up Docker Buildx
Expand All @@ -98,6 +101,6 @@ jobs:
ln -sfn /usr/local/opt/docker-buildx/bin/docker-buildx ~/.docker/cli-plugins/docker-buildx
- name: Run Integration tests
run: |
export DOCKER_HOST=unix:///Users/runner/.colima/default/docker.sock
export DOCKER_HOST=unix:///Users/runner/.lima/docker-actions-toolkit/docker.sock
cd it/
mvn clean install
2 changes: 2 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
<surefire.version>3.0.0-M2</surefire.version>
<system-stubs.version>2.0.1</system-stubs.version>
<version.assertj-core>3.25.3</version.assertj-core>
<version.sonar-maven-plugin>3.11.0.3922</version.sonar-maven-plugin>
</properties>

<dependencies>
Expand Down Expand Up @@ -733,6 +734,7 @@
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
<version>${version.sonar-maven-plugin}</version>
<executions>
<execution>
<id>sonar</id>
Expand Down

0 comments on commit 769a250

Please sign in to comment.