Skip to content
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
4 changes: 3 additions & 1 deletion .github/actions/buildnative/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ runs:
- name: Set Environment Variables
shell: bash
run: |
# actions/setup-java v6 exports the ARM64 path as JAVA_HOME_<version>_AARCH64;
# v5 and earlier used JAVA_HOME_<version>_ARM64. Accept either.
if [[ "$RUNNER_ARCH" == "ARM64" ]]; then
echo "JAVA_HOME_21=$JAVA_HOME_21_ARM64" >> $GITHUB_ENV
echo "JAVA_HOME_21=${JAVA_HOME_21_AARCH64:-$JAVA_HOME_21_ARM64}" >> $GITHUB_ENV
else
echo "JAVA_HOME_21=$JAVA_HOME_21_X64" >> $GITHUB_ENV
fi
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/environment/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ runs:
# Java 21 is needed by .NET Android
- name: Install Java 21
if: ${{ !matrix.container }}
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6.0.0
with:
distribution: temurin
java-version: '21'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
uses: ./.github/actions/environment

- name: Initialize CodeQL
uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
uses: github/codeql-action/init@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4.37.8
with:
languages: csharp

Expand All @@ -49,6 +49,6 @@ jobs:
run: dotnet build Sentry-CI-CodeQL.slnf --no-restore --nologo

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
uses: github/codeql-action/analyze@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4.37.8
with:
category: '/language:csharp'
2 changes: 1 addition & 1 deletion .github/workflows/device-tests-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ jobs:
uses: ./.github/actions/environment

- name: Select Java 21
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6.0.0
with:
distribution: temurin
java-version: '21'
Expand Down
Loading