diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 2ae4a870..4d327886 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -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: | diff --git a/e2e/spring-shell-e2e-tests/src/utils.ts b/e2e/spring-shell-e2e-tests/src/utils.ts index 76885aef..eddafdad 100644 --- a/e2e/spring-shell-e2e-tests/src/utils.ts +++ b/e2e/spring-shell-e2e-tests/src/utils.ts @@ -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';