Skip to content

Commit

Permalink
Merge pull request apache#7525 from mbien/ci-23ea
Browse files Browse the repository at this point in the history
CI: start testing on 23-ea and minor other updates
  • Loading branch information
mbien authored Jul 8, 2024
2 parents 1a1a3ac + 1987b83 commit b538269
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 55 deletions.
71 changes: 16 additions & 55 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
timeout-minutes: 40
strategy:
matrix:
java: [ '17', '21', '22' ]
java: [ '17', '21', '23-ea' ]
exclude:
- java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
fail-fast: false
Expand Down Expand Up @@ -525,6 +525,18 @@ jobs:
- name: Extract
run: tar --zstd -xf build.tar.zst

- name: apisupport.project
run: ant $OPTS -f apisupport/apisupport.project test

- name: apisupport.refactoring
run: ant $OPTS -f apisupport/apisupport.refactoring test

- name: apisupport.wizards
run: ant $OPTS -f apisupport/apisupport.wizards test

- name: timers
run: ant $OPTS -f apisupport/timers test

- name: ide/api.xml
run: ant $OPTS -f ide/api.xml test

Expand Down Expand Up @@ -808,7 +820,7 @@ jobs:
timeout-minutes: 50
strategy:
matrix:
java: [ '17', '21', '22' ]
java: [ '17', '21', '23-ea' ]
exclude:
- java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
fail-fast: false
Expand Down Expand Up @@ -1403,56 +1415,6 @@ jobs:
paths: "./*/*/build/test/*/results/TEST-*.xml"


# TODO merge this job into other jobs once tests are fixed
apisupport-modules-test:
name: APISupport Modules on Linux/JDK ${{ matrix.java }}
needs: base-build
runs-on: ubuntu-latest
timeout-minutes: 60
strategy:
matrix:
java: [ '17' ]
fail-fast: false
steps:

- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: ${{ env.DEFAULT_JAVA_DISTRIBUTION }}

- name: Setup Xvfb
run: |
echo "DISPLAY=:99.0" >> $GITHUB_ENV
Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
- name: Download Build
uses: actions/download-artifact@v4
with:
name: build

- name: Extract
run: tar --zstd -xf build.tar.zst

- name: apisupport.project
run: ant $OPTS -f apisupport/apisupport.project test

- name: apisupport.refactoring
run: ant $OPTS -f apisupport/apisupport.refactoring test

- name: apisupport.wizards
run: ant $OPTS -f apisupport/apisupport.wizards test

- name: timers
run: ant $OPTS -f apisupport/timers test

- name: Create Test Summary
uses: test-summary/action@v2
if: failure()
with:
paths: "./*/*/build/test/*/results/TEST-*.xml"


java-hints-test:
name: Java Hints ${{ matrix.config }} on Linux/JDK ${{ matrix.java }}
# equals env.test_java == 'true'
Expand Down Expand Up @@ -1509,13 +1471,13 @@ jobs:
java-debugger-test:
name: Java Debugger tests on Linux/JDK ${{ matrix.java }}
# equals env.test_java == 'true'
if: ${{ contains(github.event.pull_request.labels.*.name, 'Java') || contains(github.event.pull_request.labels.*.name, 'ci:all-tests') || github.event_name != 'pull_request' }}
if: ${{ contains(github.event.pull_request.labels.*.name, 'Java') || contains(github.event.pull_request.labels.*.name, 'debugger') || contains(github.event.pull_request.labels.*.name, 'ci:all-tests') || github.event_name != 'pull_request' }}
needs: base-build
runs-on: ubuntu-latest
timeout-minutes: 60
strategy:
matrix:
java: [ '17', '21', '22' ]
java: [ '17', '21', '23-ea' ]
exclude:
- java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
fail-fast: false
Expand Down Expand Up @@ -2658,7 +2620,6 @@ jobs:
- java-hints-test
- java-debugger-test
- profiler-test
- apisupport-modules-test
- build-tools
- webcommon-test
- php
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
package org.netbeans.modules.java.hints.threading;

import org.junit.Assume;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.java.hints.test.api.HintTest;

Expand Down Expand Up @@ -216,6 +217,7 @@ public void testThreadYield() throws Exception {
}

public void testThreadSuspend() throws Exception {
Assume.assumeTrue(Runtime.version().feature() <= 22);
HintTest
.create()
.input("package test;\n" +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ public static boolean runJavac(File src, String srcIncludes, File dest, File[] c
} else {
args.add(source);
}
args.add("-proc:full"); // https://inside.java/2024/06/18/quality-heads-up/
args.add("-Xlint:-options");
dest.mkdirs();
destG.mkdirs();
Expand Down

0 comments on commit b538269

Please sign in to comment.