Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump the npm-development group with 5 updates #135

Merged
merged 2 commits into from
Feb 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
github-token: ${{ secrets.GITHUB_TOKEN }}
components: ${{ matrix.components }}
gds-token: ${{ matrix.set-gds-token && secrets.GDS_TOKEN || '' }}
if: env.PASSES_GDS_TOKEN_CHECK
if: ${{ env.PASSES_GDS_TOKEN_CHECK == 'true' }}
- name: Check environment
run: |
echo "GRAALVM_HOME: $GRAALVM_HOME"
Expand All @@ -103,14 +103,14 @@ jobs:
java --version
java --version | grep "GraalVM" || exit 34
native-image --version
if: runner.os != 'Windows' && env.PASSES_GDS_TOKEN_CHECK
if: ${{ env.PASSES_GDS_TOKEN_CHECK == 'true' && runner.os != 'Windows' }}
- name: Check Windows environment
run: |
echo "GRAALVM_HOME: $env:GRAALVM_HOME"
echo "JAVA_HOME: $env:JAVA_HOME"
java --version
native-image --version
if: runner.os == 'Windows' && env.PASSES_GDS_TOKEN_CHECK
if: ${{ env.PASSES_GDS_TOKEN_CHECK == 'true' && runner.os == 'Windows' }}

test-action-ce: # make sure the action works on a clean machine without building
needs: test-action
Expand Down Expand Up @@ -172,21 +172,24 @@ jobs:
if [[ "${{ matrix.java-version }}" != "dev" ]]; then
gu list
fi
if: runner.os != 'Windows'
if: ${{ runner.os != 'Windows' }}
- name: Check Windows environment
run: |
echo "GRAALVM_HOME: $env:GRAALVM_HOME"
echo "JAVA_HOME: $env:JAVA_HOME"
java -version
native-image --version
gu.cmd remove native-image
if: runner.os == 'Windows'
if: ${{ runner.os == 'Windows' }}

test-action-ee:
needs: test-action
name: EE ${{ matrix.version }} + JDK${{ matrix.java-version }} on ${{ matrix.os }}
if: github.event_name != 'pull_request'
runs-on: ${{ matrix.os }}
env:
# Skip builds that require a GDS token but have no access to one (e.g., secrets are unavailable in PR runs)
PASSES_GDS_TOKEN_CHECK: ${{ secrets.GDS_TOKEN != '' }}
strategy:
matrix:
version: ['latest']
Expand All @@ -212,6 +215,7 @@ jobs:
java-version: ${{ matrix.java-version }}
components: ${{ matrix.components }}
github-token: ${{ secrets.GITHUB_TOKEN }}
if: ${{ env.PASSES_GDS_TOKEN_CHECK == 'true' }}
- name: Check environment
run: |
echo "GRAALVM_HOME: $GRAALVM_HOME"
Expand All @@ -221,15 +225,15 @@ jobs:
java --version | grep -e "GraalVM EE" -e "Oracle GraalVM" || exit 23
native-image --version
gu list
if: runner.os != 'Windows'
if: ${{ env.PASSES_GDS_TOKEN_CHECK == 'true' && runner.os != 'Windows' }}
- name: Check Windows environment
run: |
echo "GRAALVM_HOME: $env:GRAALVM_HOME"
echo "JAVA_HOME: $env:JAVA_HOME"
java --version
native-image --version
gu.cmd remove native-image
if: runner.os == 'Windows'
if: ${{ env.PASSES_GDS_TOKEN_CHECK == 'true' && runner.os == 'Windows' }}

test-action-mandrel:
needs: test-action
Expand Down Expand Up @@ -267,14 +271,14 @@ jobs:
java --version
java --version | grep "Temurin" || exit 23
native-image --version
if: runner.os != 'Windows'
if: ${{ runner.os != 'Windows' }}
- name: Check Windows environment
run: |
echo "GRAALVM_HOME: $env:GRAALVM_HOME"
echo "JAVA_HOME: $env:JAVA_HOME"
java --version
native-image --version
if: runner.os == 'Windows'
if: ${{ runner.os == 'Windows' }}

test-action-liberica:
needs: test-action
Expand Down Expand Up @@ -303,7 +307,7 @@ jobs:
java --version | fgrep -qw ${{ matrix.java-version }} || exit 23
native-image --version
native-image --version | fgrep -qw ${{ matrix.java-version }} || exit 24
if: runner.os != 'Windows'
if: ${{ runner.os != 'Windows' }}
- name: Check Windows environment
shell: pwsh
run: |
Expand All @@ -317,7 +321,7 @@ jobs:
if (!(native-image --version | findstr \<${{ matrix.java-version }}\>)) {
exit 24
}
if: runner.os == 'Windows'
if: ${{ runner.os == 'Windows' }}

test-action-native-image-windows:
name: native-image on windows-latest
Expand Down Expand Up @@ -472,11 +476,11 @@ jobs:
mvn --no-transfer-progress -Pnative package
bash verify-sbom.sh
shell: bash
if: runner.os != 'Windows'
if: ${{ runner.os != 'Windows' }}
- name: Build Maven project and verify that SBOM was generated and its contents (Windows)
run: |
cd __tests__\sbom\main-test-app
mvn --no-transfer-progress -Pnative package
cmd /c verify-sbom.cmd
shell: cmd
if: runner.os == 'Windows'
if: ${{ runner.os == 'Windows' }}
Loading
Loading