Skip to content

Commit 212ee43

Browse files
committed
Change e2e tests for gradle changes
- Fix e2e workflow to build with gradle. - Fix e2e paths to ones generated by gradle. - Relates #470
1 parent fee09f9 commit 212ee43

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.github/workflows/e2e.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
with:
2929
distribution: adopt
3030
java-version: 17
31-
cache: maven
31+
cache: gradle
3232
- uses: graalvm/setup-graalvm@v1
3333
with:
3434
version: ${{ matrix.graal }}
@@ -40,15 +40,15 @@ jobs:
4040
with:
4141
node-version: '16'
4242
- run: |
43-
./mvnw clean package -Pnativex
43+
./gradlew clean build nativeCompile
4444
- uses: actions/upload-artifact@v2
4545
with:
4646
name: spring-shell-samples-${{ matrix.nickname }}
4747
retention-days: 1
4848
path: |
49-
spring-shell-samples/target/*.jar
50-
spring-shell-samples/target/spring-shell-samples
51-
spring-shell-samples/target/spring-shell-samples.exe
49+
spring-shell-samples/build/libs/*.jar
50+
spring-shell-samples/build/native/nativeCompile/spring-shell-samples
51+
spring-shell-samples/build/native/nativeCompile/spring-shell-samples.exe
5252
- name: compile e2e module
5353
working-directory: e2e/spring-shell-e2e
5454
run: |

e2e/spring-shell-e2e-tests/src/utils.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import * as path from 'path';
44
export const tempDir = path.join(__dirname, 'spring-shell', 'temp');
55
export const isWindows = os.platform() === 'win32';
66
export const cliPathRelative = isWindows
7-
? '..\\..\\spring-shell-samples\\target\\spring-shell-samples.exe'
8-
: '../../spring-shell-samples/target/spring-shell-samples';
7+
? '..\\..\\spring-shell-samples\\build\\native\\nativeCompile\\spring-shell-samples.exe'
8+
: '../../spring-shell-samples/build/native/nativeCompile/spring-shell-samples';
99
export const jarPathRelative = isWindows
10-
? '..\\..\\spring-shell-samples\\target\\spring-shell-samples-3.0.0-SNAPSHOT-exec.jar'
11-
: '../../spring-shell-samples/target/spring-shell-samples-3.0.0-SNAPSHOT-exec.jar';
10+
? '..\\..\\spring-shell-samples\\build\\libs\\spring-shell-samples-3.0.0-SNAPSHOT.jar'
11+
: '../../spring-shell-samples/build/libs/spring-shell-samples-3.0.0-SNAPSHOT.jar';
1212
export const cliPath = path.resolve(cliPathRelative);
1313
export const jarPath = path.resolve(jarPathRelative);
1414
export const nativeDesc = 'native';

0 commit comments

Comments
 (0)