Skip to content

Commit cc1dcec

Browse files
committed
Java download fixes
1 parent c8f475e commit cc1dcec

8 files changed

+44
-18
lines changed

.github/workflows/checkstyle.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@ jobs:
1616
steps:
1717
- name: "☁️ Checkout repository"
1818
uses: actions/checkout@v4
19+
1920
- uses: actions/setup-python@v4
21+
2022
- name: "🔧 Setup java"
2123
uses: actions/setup-java@v4
2224
with:
2325
distribution: 'graalvm'
2426
java-version: '21'
25-
github-token: ${{ secrets.GITHUB_TOKEN }}
27+
2628
- run: ./gradlew checkstyle

.github/workflows/create-scheduled-release.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ jobs:
2222
uses: actions/checkout@v4
2323
with:
2424
fetch-depth: 0
25+
2526
- name: "🔧 Setup java"
2627
uses: actions/setup-java@v4
2728
with:
2829
distribution: 'graalvm'
2930
java-version: '21'
30-
github-token: ${{ secrets.GITHUB_TOKEN }}
31+
3132
- name: "🕸️ Get changed metadata matrix"
3233
id: set-matrix
3334
run: |
@@ -46,28 +47,33 @@ jobs:
4647
uses: actions/checkout@v4
4748
with:
4849
fetch-depth: 0
50+
4951
- name: "🔧 Setup java"
5052
uses: actions/setup-java@v4
5153
with:
5254
distribution: 'graalvm'
5355
java-version: '21'
54-
github-token: ${{ secrets.GITHUB_TOKEN }}
56+
5557
- name: "Get tags"
5658
run: |
5759
PREVIOUS_RELEASE_TAG=$(git tag --list | sort -V | tail -1)
5860
echo "PREVIOUS_RELEASE_TAG=$PREVIOUS_RELEASE_TAG" >> ${GITHUB_ENV}
5961
6062
CURRENT_RELEASE_TAG=$(sed -E 's/^([0-9]+\.)([0-9]+\.)([0-9]+)/echo \1\2$((\3+1))/e' <<< $PREVIOUS_RELEASE_TAG)
6163
echo "CURRENT_RELEASE_TAG=$CURRENT_RELEASE_TAG" >> ${GITHUB_ENV}
64+
6265
- name: "⬆️ Update version"
6366
run: |
6467
sed -i "s/project.version(\"1.0.0-SNAPSHOT\")/project.version(\"${{ env.CURRENT_RELEASE_TAG }}\")/g" build.gradle
68+
6569
- name: "🔍 Run spotless check"
6670
run: |
6771
./gradlew spotlessCheck
72+
6873
- name: "🏭 Generate release artifacts"
6974
run: |
7075
./gradlew package
76+
7177
- name: "📄 Commit changes"
7278
run: |
7379
git config --local user.email "[email protected]"
@@ -76,6 +82,7 @@ jobs:
7682
git commit -m "Release version ${{ env.CURRENT_RELEASE_TAG }}"
7783
git tag ${{ env.CURRENT_RELEASE_TAG }}
7884
git push origin ${{ env.CURRENT_RELEASE_TAG }}
85+
7986
- name: "📝 Publish a release"
8087
run: |
8188
gh release create ${{ env.CURRENT_RELEASE_TAG }} build/graalvm-reachability-metadata-*.zip --generate-notes --notes-start-tag ${{ env.PREVIOUS_RELEASE_TAG }}

.github/workflows/library-and-framework-list-validation.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ jobs:
1414
steps:
1515
- name: "☁️ Checkout repository"
1616
uses: actions/checkout@v4
17+
1718
- uses: actions/setup-python@v4
1819
with:
1920
python-version: '3.10'
21+
2022
- name: Check that the JSON file is well-formatted and sorted by artifact
2123
run: |
2224
JSON="library-and-framework-list.json"
@@ -29,6 +31,7 @@ jobs:
2931
echo "'${JSON}' is no longer sorted by artifact key. You can use 'jq' to sort it: 'sorted="$(jq -s '.[] | sort_by(.artifact)' ${JSON})" && echo -E "${sorted}" > ${JSON}"
3032
exit 8
3133
fi
34+
3235
- name: Check that the JSON file conforms to the schema
3336
run: |
3437
pip install check-jsonschema

.github/workflows/scan-docker-images.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,22 @@ jobs:
1818
uses: actions/checkout@v4
1919
with:
2020
fetch-depth: 0
21+
2122
- uses: actions/setup-java@v4
2223
with:
2324
distribution: 'graalvm'
2425
java-version: '21'
2526
github-token: ${{ secrets.GITHUB_TOKEN }}
27+
2628
- name: "Install required tools"
2729
run: |
2830
curl -sSfL https://get.anchore.io/grype/v0.104.0/install.sh | sudo sh -s -- -b /usr/local/bin
2931
sudo apt-get install jq
32+
3033
- name: "🔎 Check changed docker images"
3134
if: github.event_name == 'pull_request'
3235
run: ./gradlew checkAllowedDockerImages --baseCommit=${{ github.event.pull_request.base.sha }} --newCommit=${{ github.event.pull_request.head.sha }}
36+
3337
- name: "🔎 Check all docker images"
3438
if: github.event_name != 'pull_request' && github.repository == 'oracle/graalvm-reachability-metadata'
3539
run: ./gradlew checkAllowedDockerImages

.github/workflows/test-all-metadata.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@ jobs:
2323
steps:
2424
- name: "☁️ Checkout repository"
2525
uses: actions/checkout@v4
26+
2627
- name: "🔧 Setup java"
2728
uses: actions/setup-java@v4
2829
with:
2930
distribution: 'graalvm'
3031
java-version: '21'
31-
github-token: ${{ secrets.GITHUB_TOKEN }}
32+
3233
- name: "🕸️ Populate matrix"
3334
id: set-matrix
3435
run: |
@@ -46,24 +47,29 @@ jobs:
4647
steps:
4748
- name: "☁️ Checkout repository"
4849
uses: actions/checkout@v4
50+
4951
- name: "🔧 Setup java"
5052
uses: actions/setup-java@v4
5153
with:
5254
distribution: 'graalvm'
5355
java-version: '21'
54-
- name: "🔧 Prepare environment"
56+
57+
- name: "🔧 Download GraalVM for metadata testing"
5558
uses: graalvm/setup-graalvm@v1
5659
with:
5760
distribution: 'graalvm'
5861
java-version: ${{ matrix.version }}
5962
set-java-home: 'false'
6063
native-image-job-reports: 'true'
6164
github-token: ${{ secrets.GITHUB_TOKEN }}
65+
6266
- name: "Pull allowed docker images"
6367
run: |
6468
./gradlew pullAllowedDockerImages -Pcoordinates=${{ matrix.coordinates }}
69+
6570
- name: "Disable docker networking"
6671
run: bash ./.github/workflows/scripts/disable-docker.sh
72+
6773
- name: "🧪 Run '${{ matrix.coordinates }}' tests"
6874
run: |
6975
./gradlew test -Pcoordinates=${{ matrix.coordinates }}

.github/workflows/test-changed-infrastructure.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@ jobs:
2929
uses: actions/checkout@v4
3030
with:
3131
fetch-depth: 0
32+
3233
- name: "🔧 Setup java"
33-
uses: graalvm/setup-graalvm@v1
34+
uses: actions/setup-java@v4
3435
with:
3536
distribution: 'graalvm'
3637
java-version: '21'
37-
github-token: ${{ secrets.GITHUB_TOKEN }}
38+
3839
- name: "🕸️ Populate matrix"
3940
id: set-matrix
4041
run: |
@@ -61,12 +62,12 @@ jobs:
6162
distribution: 'graalvm'
6263
java-version: '21'
6364

64-
- name: "🔧 Prepare environment"
65+
- name: "🔧 Download GraalVM for metadata testing"
6566
uses: graalvm/setup-graalvm@v1
6667
with:
67-
set-java-home: "false"
68-
java-version: ${{ matrix.version }}
6968
distribution: "graalvm"
69+
java-version: ${{ matrix.version }}
70+
set-java-home: "false"
7071
github-token: ${{ secrets.GITHUB_TOKEN }}
7172
native-image-job-reports: "true"
7273

.github/workflows/test-changed-metadata.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,28 +50,33 @@ jobs:
5050
steps:
5151
- name: "☁️ Checkout repository"
5252
uses: actions/checkout@v4
53+
5354
- name: "🔧 Setup java"
5455
uses: actions/setup-java@v4
5556
with:
5657
distribution: 'graalvm'
5758
java-version: '21'
58-
github-token: ${{ secrets.GITHUB_TOKEN }}
59-
- name: "🔧 Prepare environment"
59+
60+
- name: "🔧 Download GraalVM for metadata testing"
6061
uses: graalvm/setup-graalvm@v1
6162
with:
6263
distribution: 'graalvm'
6364
java-version: ${{ matrix.version }}
6465
set-java-home: 'false'
6566
native-image-job-reports: 'true'
6667
github-token: ${{ secrets.GITHUB_TOKEN }}
68+
6769
- name: "Pull allowed docker images"
6870
run: |
6971
./gradlew pullAllowedDockerImages -Pcoordinates=${{ matrix.coordinates }}
72+
7073
- name: "Disable docker networking"
7174
run: bash ./.github/workflows/scripts/disable-docker.sh
75+
7276
- name: "🔎 Check metadata files content"
7377
run: |
7478
./gradlew checkMetadataFiles -Pcoordinates=${{ matrix.coordinates }}
79+
7580
- name: "🧪 Run '${{ matrix.coordinates }}' tests"
7681
run: |
7782
./gradlew test -Pcoordinates=${{ matrix.coordinates }}

.github/workflows/verify-new-library-version-compatibility.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,11 @@ jobs:
2727
- name: "☁️ Checkout repository"
2828
uses: actions/checkout@v4
2929

30-
- name: "🔧 Prepare environment"
31-
uses: graalvm/setup-graalvm@v1
30+
- name: "🔧 Setup java"
31+
uses: actions/setup-java@v4
3232
with:
33-
java-version: '21'
3433
distribution: 'graalvm'
35-
github-token: ${{ secrets.GITHUB_TOKEN }}
34+
java-version: '21'
3635

3736
- name: "📅 Set branch name"
3837
id: set-branch-name
@@ -76,9 +75,8 @@ jobs:
7675
with:
7776
distribution: 'graalvm'
7877
java-version: '21'
79-
github-token: ${{ secrets.GITHUB_TOKEN }}
8078

81-
- name: "🔧 Prepare environment"
79+
- name: "🔧 Download GraalVM for metadata testing"
8280
uses: graalvm/setup-graalvm@v1
8381
with:
8482
distribution: 'graalvm'

0 commit comments

Comments
 (0)