FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

CI: JDK 24 ga, pin actions, enable dependabot again and minor updates · apache/netbeans@6e1d1ea · GitHub

/ netbeans Public

Commit 6e1d1ea

Browse files
mbien
committed
CI: JDK 24 ga, pin actions, enable dependabot again and minor updates
 - switch from JDK 24 ea to ga - pin third party actions to hash - enable dependabot for action updates - add retry on IOException to BinariesListUpdates checker
1 parent 9c40632 commit 6e1d1ea

4 files changed

Lines changed: 85 additions & 33 deletions

File tree

‎.asf.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ github:
3131
projects: true
3232
discussions: true
3333
dependabot_alerts: false
34-
dependabot_updates: false
34+
dependabot_updates: true
3535
enabled_merge_buttons:
3636
squash: false
3737
merge: true

‎.github/dependabot.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
version: 2
19+
updates:
20+
21+
- package-ecosystem: "github-actions"
22+
directory: "/"
23+
schedule:
24+
interval: "weekly"
25+
labels:
26+
- "Upgrade Library"
27+
- "CI"
28+
29+
# for project dependencies see .github/workflows/dependency-checks.yml

‎.github/scripts/BinariesListUpdates.java‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@
2020
import java.io.IOException;
2121
import java.nio.file.Files;
2222
import java.nio.file.Path;
23+
import java.util.List;
2324
import java.util.concurrent.Semaphore;
2425
import java.util.concurrent.atomic.LongAdder;
2526
import java.util.stream.Stream;
27+
import org.apache.maven.search.api.Record;
2628
import org.apache.maven.search.api.SearchRequest;
2729
import org.apache.maven.search.backend.smo.SmoSearchBackend;
2830
import org.apache.maven.search.backend.smo.SmoSearchBackendFactory;
@@ -129,7 +131,19 @@ private static String queryLatestVersion(SmoSearchBackend backend, String gid, S
129131
private static String queryLatestVersion(SmoSearchBackend backend, SearchRequest request) throws IOException, InterruptedException {
130132
requests.acquire();
131133
try {
132-
return backend.search(request).getPage().stream()
134+
List<Record> results;
135+
try {
136+
results = backend.search(request).getPage();
137+
} catch (IOException ex) {
138+
System.out.println("received exception: '" + ex.getMessage() + "', retry in 10s");
139+
Thread.sleep(10_000);
140+
try {
141+
results = backend.search(request).getPage();
142+
} catch(IOException ignore) {
143+
throw ex;
144+
}
145+
}
146+
return results.stream()
133147
.map(r -> r.getValue(VERSION))
134148
.filter(v -> !v.contains("alpha") && !v.contains("beta"))
135149
.filter(v -> !v.contains("M") && !v.contains("m") && !v.contains("B") && !v.contains("b") && !v.contains("ea") && !v.contains("RC"))

‎.github/workflows/main.yml‎

Lines changed: 40 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,15 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18+
# https://infra.apache.org/github-actions-policy.html
19+
# actions:
20+
# - github actions use the latest release within the locked major version
21+
# - third party actions (geekyeggo/delete-artifact, test-summary/action and shivammathur/setup-ph) shall be locked to a hash
22+
# - see https://github.com/apache/infrastructure-gha-allowlist-manager/blob/main/approved_patterns.yml
23+
# - dependabot is active to keep them up to date
24+
#
25+
# this workflow can push the limit of the apache action runner policy, please use CI responsibly
26+
1827
name: NetBeans
1928

2029
on:
@@ -124,7 +133,7 @@ jobs:
124133
timeout-minutes: 40
125134
strategy:
126135
matrix:
127-
java: [ '17', '21', '24-ea' ]
136+
java: [ '17', '21', '24' ]
128137
exclude:
129138
- java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
130139
fail-fast: false
@@ -229,7 +238,7 @@ jobs:
229238
java: [ 17 ]
230239
include:
231240
- os: ubuntu-latest
232-
java: 24-ea
241+
java: 24
233242
fail-fast: false
234243
steps:
235244

@@ -270,7 +279,7 @@ jobs:
270279
run: ant $OPTS -f platform/core.network test
271280

272281
- name: Create Test Summary
273-
uses: test-summary/action@v2
282+
uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
274283
if: failure()
275284
with:
276285
paths: |
@@ -305,11 +314,11 @@ jobs:
305314
submodules: false
306315
show-progress: false
307316

308-
- name: Set up JDK 23 for scripts
317+
- name: Set up JDK 24 for scripts
309318
if: ${{ github.event_name == 'pull_request' && !cancelled() }}
310319
uses: actions/setup-java@v4
311320
with:
312-
java-version: 23
321+
java-version: 24
313322
distribution: ${{ env.DEFAULT_JAVA_DISTRIBUTION }}
314323

315324
- name: Check Commit Headers
@@ -441,7 +450,7 @@ jobs:
441450
run: ant $OPTS build-javadoc
442451

443452
- name: Create Test Summary
444-
uses: test-summary/action@v2
453+
uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
445454
if: failure()
446455
with:
447456
paths: "./*/*/build/test/*/results/TEST-*.xml"
@@ -822,7 +831,7 @@ jobs:
822831
run: ant $OPTS -f ide/xsl test
823832

824833
- name: Create Test Summary
825-
uses: test-summary/action@v2
834+
uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
826835
if: failure()
827836
with:
828837
paths: "./*/*/build/test/*/results/TEST-*.xml"
@@ -837,7 +846,7 @@ jobs:
837846
timeout-minutes: 50
838847
strategy:
839848
matrix:
840-
java: [ '17', '21', '24-ea' ]
849+
java: [ '17', '21', '24' ]
841850
exclude:
842851
- java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
843852
fail-fast: false
@@ -945,7 +954,7 @@ jobs:
945954
run: ant $OPTS -f apisupport/apisupport.ant test
946955

947956
- name: Create Test Summary
948-
uses: test-summary/action@v2
957+
uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
949958
if: failure()
950959
with:
951960
paths: "./*/*/build/test/*/results/TEST-*.xml"
@@ -1108,7 +1117,7 @@ jobs:
11081117
run: ant $OPTS -f platform/netbinox test -Dtest.config=stableBTD
11091118

11101119
- name: Create Test Summary
1111-
uses: test-summary/action@v2
1120+
uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
11121121
if: failure()
11131122
with:
11141123
paths: "./*/*/build/test/*/results/TEST-*.xml"
@@ -1246,7 +1255,7 @@ jobs:
12461255
run: ant $OPTS -f platform/api.templates test
12471256

12481257
- name: Create Test Summary
1249-
uses: test-summary/action@v2
1258+
uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
12501259
if: failure()
12511260
with:
12521261
paths: "./*/*/build/test/*/results/TEST-*.xml"
@@ -1429,7 +1438,7 @@ jobs:
14291438
run: ant $OPTS -f java/javadoc test
14301439

14311440
- name: Create Test Summary
1432-
uses: test-summary/action@v2
1441+
uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
14331442
if: failure()
14341443
with:
14351444
paths: "./*/*/build/test/*/results/TEST-*.xml"
@@ -1444,10 +1453,10 @@ jobs:
14441453
timeout-minutes: 60
14451454
strategy:
14461455
matrix:
1447-
java: [ '17', '24-ea' ]
1456+
java: [ '17', '24' ]
14481457
config: [ 'batch1', 'batch2' ]
14491458
exclude:
1450-
- java: ${{ github.event_name == 'pull_request' && 'nothing' || '24-ea' }}
1459+
- java: ${{ github.event_name == 'pull_request' && 'nothing' || '24' }}
14511460
fail-fast: false
14521461
steps:
14531462

@@ -1482,7 +1491,7 @@ jobs:
14821491
run: ant $OPTS -f java/spi.java.hints test
14831492

14841493
- name: Create Test Summary
1485-
uses: test-summary/action@v2
1494+
uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
14861495
if: failure()
14871496
with:
14881497
paths: "./*/*/build/test/*/results/TEST-*.xml"
@@ -1497,7 +1506,7 @@ jobs:
14971506
timeout-minutes: 60
14981507
strategy:
14991508
matrix:
1500-
java: [ '17', '21', '24-ea' ]
1509+
java: [ '17', '21', '24' ]
15011510
exclude:
15021511
- java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
15031512
fail-fast: false
@@ -1544,7 +1553,7 @@ jobs:
15441553
# run: ant $OPTS -f java/debugger.jpda.ui test
15451554

15461555
- name: Create Test Summary
1547-
uses: test-summary/action@v2
1556+
uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
15481557
if: failure()
15491558
with:
15501559
paths: "./*/*/build/test/*/results/TEST-*.xml"
@@ -1589,7 +1598,7 @@ jobs:
15891598
run: ant $OPTS -f profiler/profiler.oql test
15901599

15911600
- name: Create Test Summary
1592-
uses: test-summary/action@v2
1601+
uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
15931602
if: failure()
15941603
with:
15951604
paths: "./*/*/build/test/*/results/TEST-*.xml"
@@ -1764,7 +1773,7 @@ jobs:
17641773
run: ant $OPTS -f webcommon/api.knockout test
17651774

17661775
- name: Create Test Summary
1767-
uses: test-summary/action@v2
1776+
uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
17681777
if: failure()
17691778
with:
17701779
paths: "./*/*/build/test/*/results/TEST-*.xml"
@@ -1812,7 +1821,7 @@ jobs:
18121821
# run: ant $OPTS -f javafx/javafx2.project test
18131822

18141823
- name: Create Test Summary
1815-
uses: test-summary/action@v2
1824+
uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
18161825
if: failure()
18171826
with:
18181827
paths: "./*/*/build/test/*/results/TEST-*.xml"
@@ -1865,7 +1874,7 @@ jobs:
18651874
# run: ant $OPTS -f groovy/groovy.kit test
18661875

18671876
- name: Create Test Summary
1868-
uses: test-summary/action@v2
1877+
uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
18691878
if: failure()
18701879
with:
18711880
paths: "./*/*/build/test/*/results/TEST-*.xml"
@@ -1913,7 +1922,7 @@ jobs:
19131922
run: ant $OPTS -f rust/rust.options test
19141923

19151924
- name: Create Test Summary
1916-
uses: test-summary/action@v2
1925+
uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
19171926
if: failure()
19181927
with:
19191928
paths: "./*/*/build/test/*/results/TEST-*.xml"
@@ -2157,7 +2166,7 @@ jobs:
21572166
run: ant $OPTS -f enterprise/j2ee.dd.webservice test
21582167

21592168
- name: Create Test Summary
2160-
uses: test-summary/action@v2
2169+
uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
21612170
if: failure()
21622171
with:
21632172
paths: "./*/*/build/test/*/results/TEST-*.xml"
@@ -2240,7 +2249,7 @@ jobs:
22402249
ant $OPTS -f ide/versioning test-qa-functional
22412250
22422251
- name: Create Test Summary
2243-
uses: test-summary/action@v2
2252+
uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
22442253
if: failure()
22452254
with:
22462255
paths: "./*/*/build/test/*/results/TEST-*.xml"
@@ -2300,7 +2309,7 @@ jobs:
23002309
run: .github/retry.sh ant $OPTS $OPTS_TEST -f ide/db.mysql test
23012310

23022311
- name: Create Test Summary
2303-
uses: test-summary/action@v2
2312+
uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
23042313
if: failure()
23052314
with:
23062315
paths: "./*/*/build/test/*/results/TEST-*.xml"
@@ -2347,7 +2356,7 @@ jobs:
23472356
# linux specific setup
23482357
- name: Setup PHP
23492358
if: contains(matrix.os, 'ubuntu')
2350-
uses: shivammathur/setup-php@v2
2359+
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
23512360
with:
23522361
php-version: '8.3'
23532362
tools: pecl
@@ -2458,7 +2467,7 @@ jobs:
24582467
run: ant $OPTS -f php/spellchecker.bindings.php test
24592468

24602469
- name: Create Test Summary
2461-
uses: test-summary/action@v2
2470+
uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
24622471
if: failure()
24632472
with:
24642473
paths: "./*/*/build/test/*/results/TEST-*.xml"
@@ -2503,7 +2512,7 @@ jobs:
25032512
run: .github/retry.sh ant $OPTS -f java/java.lsp.server test
25042513

25052514
- name: Create Test Summary
2506-
uses: test-summary/action@v2
2515+
uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
25072516
if: failure()
25082517
with:
25092518
paths: "./*/*/build/test/*/results/TEST-*.xml"
@@ -2569,7 +2578,7 @@ jobs:
25692578
run: .github/retry.sh ant $OPTS -f java/debugger.jpda.truffle test
25702579

25712580
- name: Create Test Summary
2572-
uses: test-summary/action@v2
2581+
uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
25732582
if: failure()
25742583
with:
25752584
paths: "./*/*/build/test/*/results/TEST-*.xml"
@@ -2662,13 +2671,13 @@ jobs:
26622671
steps:
26632672

26642673
- name: Delete Workspace Artifact
2665-
uses: geekyeggo/delete-artifact@v5
2674+
uses: geekyeggo/delete-artifact@f275313e70c08f6120db482d7a6b98377786765b # v5.1.0
26662675
with:
26672676
name: build
26682677
useGlob: false
26692678

26702679
- name: Delete Dev Build Artifact
2671-
uses: geekyeggo/delete-artifact@v5
2680+
uses: geekyeggo/delete-artifact@f275313e70c08f6120db482d7a6b98377786765b # v5.1.0
26722681
if: ${{ contains(github.event.pull_request.labels.*.name, 'ci:dev-build') && cancelled() }}
26732682
with:
26742683
name: dev-build_${{github.event.pull_request.number || github.run_id}}

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL