Spring/spring-shell
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change e2e tests for gradle changes

Browse Source 
- Fix e2e workflow to build with gradle.
- Fix e2e paths to ones generated by gradle.
- Relates #470
This commit is contained in:
Janne Valkealahti
2022-08-17 08:52:19 +01:00
parent fee09f9ff5
commit 212ee43989
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/e2e.yml vendored
View File

@@ -28,7 +28,7 @@ jobs:
with:
distribution: adopt
java-version: 17
cache: maven
cache: gradle
- uses: graalvm/setup-graalvm@v1
with:
version: ${{ matrix.graal }}
@@ -40,15 +40,15 @@ jobs:
with:
node-version: '16'
- run: |
./mvnw clean package -Pnativex
./gradlew clean build nativeCompile
- uses: actions/upload-artifact@v2
with:
name: spring-shell-samples-${{ matrix.nickname }}
retention-days: 1
path: |
spring-shell-samples/target/*.jar
spring-shell-samples/target/spring-shell-samples
spring-shell-samples/target/spring-shell-samples.exe
spring-shell-samples/build/libs/*.jar
spring-shell-samples/build/native/nativeCompile/spring-shell-samples
spring-shell-samples/build/native/nativeCompile/spring-shell-samples.exe
- name: compile e2e module
working-directory: e2e/spring-shell-e2e
run: |

8
e2e/spring-shell-e2e-tests/src/utils.ts
View File

@@ -4,11 +4,11 @@ import * as path from 'path';
export const tempDir = path.join(__dirname, 'spring-shell', 'temp');
export const isWindows = os.platform() === 'win32';
export const cliPathRelative = isWindows
? '..\\..\\spring-shell-samples\\target\\spring-shell-samples.exe'
: '../../spring-shell-samples/target/spring-shell-samples';
? '..\\..\\spring-shell-samples\\build\\native\\nativeCompile\\spring-shell-samples.exe'
: '../../spring-shell-samples/build/native/nativeCompile/spring-shell-samples';
export const jarPathRelative = isWindows
? '..\\..\\spring-shell-samples\\target\\spring-shell-samples-3.0.0-SNAPSHOT-exec.jar'
: '../../spring-shell-samples/target/spring-shell-samples-3.0.0-SNAPSHOT-exec.jar';
? '..\\..\\spring-shell-samples\\build\\libs\\spring-shell-samples-3.0.0-SNAPSHOT.jar'
: '../../spring-shell-samples/build/libs/spring-shell-samples-3.0.0-SNAPSHOT.jar';
export const cliPath = path.resolve(cliPathRelative);
export const jarPath = path.resolve(jarPathRelative);
export const nativeDesc = 'native';