Skip to content

Commit

Permalink
add back maven shade to ci
Browse files Browse the repository at this point in the history
to make sure karate runs using fatjar / all classifier
  • Loading branch information
ptrthomas committed Jun 27, 2023
1 parent 9bd9dfa commit d60623f
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/jdk-compat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ jobs:
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-maven-
- name: build with maven
run: mvn -B clean install -pl '!karate-gatling' -Djavacpp.platform=linux-x86_64
run: mvn -B clean install -P pre-release -pl '!karate-gatling' -Djavacpp.platform=linux-x86_64
2 changes: 1 addition & 1 deletion .github/workflows/maven-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-maven-
- name: build with maven
run: mvn -B clean install -Djavacpp.platform=linux-x86_64
run: mvn -B clean install -P pre-release -Djavacpp.platform=linux-x86_64
- name: build and test with docker
run: ./build-docker.sh
- name: upload workspace if build fails
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
mvn versions:set versions:commit -B -ntp -DnewVersion=${{ github.event.inputs.version }}
- name: docker build
run: |
mvn clean install -B -ntp -DskipTests
mvn clean install -B -ntp -DskipTests -P pre-release
./build-docker.sh
- name: docker login
uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc
Expand Down
2 changes: 1 addition & 1 deletion build-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -x -e

# assume that karate jars are installed in maven local repo
# mvn clean install -DskipTests
# mvn clean install -DskipTests -P pre-release

KARATE_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)

Expand Down
2 changes: 2 additions & 0 deletions examples/gatling/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
<artifactId>karate-core</artifactId>
<version>${karate.version}</version>
<scope>test</scope>
<!-- next line is normally not required, but is here for testing karate release process -->
<classifier>all</classifier>
</dependency>
<dependency>
<groupId>com.intuit.karate</groupId>
Expand Down
2 changes: 2 additions & 0 deletions karate-e2e-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
<artifactId>karate-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<!-- next line is normally not required, but is here for testing karate release process -->
<classifier>all</classifier>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down

0 comments on commit d60623f

Please sign in to comment.