Skip to content

Commit

Permalink
Remove unused imports, add mac info to README.md, do not ignore java …
Browse files Browse the repository at this point in the history
…11 for ubuntu latest anymore. Not sure why this is configured by wiremock yet.
  • Loading branch information
holomekc committed Sep 17, 2023
1 parent c603cf0 commit 6e9b8ec
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ jobs:
# run: ./gradlew check sonarqube --stacktrace --no-daemon

- name: Test WireMock
if: ${{ !(matrix.os == 'ubuntu-latest' && matrix.jdk == 11 && github.event_name == 'push') }}
run: ./gradlew check --stacktrace --no-daemon

# - name: Archive WireMock test report - ${{ matrix.os }} JDK ${{ matrix.jdk }}
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ holomekc/wiremock-gui:{version} or holomekc/wiremock-gui:latest
holomekc/wiremock-gui:{version}-alpine or holomekc/wiremock-gui:latest-alpine
- linux/amd64

#### Mac M[1-2]
In case you want to use this Docker image on an Apple Mac with M1 or M2 processor you cannot use the alpine image. The docker images are baces on the official wiremock docker images. I only replace the build jar file in the image. The official wiremock docker images uses eclipse-temurin as base image for the alpine and none alpine version. Sadly the alpine version of temurin does not support arm yet. See: https://github.com/adoptium/containers/issues/158. Theoretically, I could switch to a different base image, but this would create increased maintenance. I hope temurin is updated soon-ish. Please use the none alpine version on a Mac for the time being.

#### Images
[Mappings](./images/mappings.png)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@
import com.github.tomakehurst.wiremock.matching.RequestPattern;
import com.github.tomakehurst.wiremock.stubbing.StubMapping;
import com.github.tomakehurst.wiremock.stubbing.StubMappings;
import org.apache.commons.lang3.StringUtils;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

public class WireMockServerRunner {

Expand Down

0 comments on commit 6e9b8ec

Please sign in to comment.