From 7bfdc01d5f09610206557e55b6ad7a6d887d5452 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Thu, 18 Apr 2024 20:56:15 +0200 Subject: [PATCH 1/8] Cumulative update of GH flow --- .github/workflows/early-access.yaml | 20 ++++++++------------ .github/workflows/release.yaml | 16 ++++++++-------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/.github/workflows/early-access.yaml b/.github/workflows/early-access.yaml index 40fe719e3..e4423e114 100644 --- a/.github/workflows/early-access.yaml +++ b/.github/workflows/early-access.yaml @@ -18,13 +18,9 @@ name: Early Access # trigger on push to branches and PR -on: - push: - branch: - pull_request: +on: [push, pull_request] env: - GRAALVM_VERSION: '22.3.1' JAVA_VERSION: '17' jobs: @@ -34,14 +30,14 @@ jobs: runs-on: ubuntu-22.04 steps: - name: 'Checkout' - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: 'Run default (non-native) build' run: ./mvnw verify -Dmrm=false -B -ntp -e - name: 'Upload daemon test logs' if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: daemon-test-logs-default-build path: integration-tests/target/mvnd-tests/**/daemon*.log @@ -57,7 +53,7 @@ jobs: steps: - name: 'Checkout' - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: 'Set vars' shell: bash @@ -70,8 +66,8 @@ jobs: - name: 'Set up Graal' uses: graalvm/setup-graalvm@v1 with: - version: ${{ env.GRAALVM_VERSION }} java-version: ${{ env.JAVA_VERSION }} + distribution: 'graalvm' components: 'native-image' github-token: ${{ secrets.GITHUB_TOKEN }} @@ -113,19 +109,19 @@ jobs: - name: 'Upload daemon test logs' if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: daemon-test-logs-${{ env.OS }} path: integration-tests/target/mvnd-tests/**/daemon*.log - name: 'Upload m39 artifact' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: mvnd-m39-${{ env.OS }} path: dist-m39/target/maven-mvnd-*.zip - name: 'Upload m40 artifact' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: mvnd-m40-${{ env.OS }} path: dist-m40/target/maven-mvnd-*.zip diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 898cf98ff..5d3916227 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -40,7 +40,7 @@ jobs: steps: - name: 'Check out repository' - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: 'Set vars' shell: bash @@ -95,7 +95,7 @@ jobs: (( err == 1 )) - name: 'Upload artifact' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: artifacts path: | @@ -109,7 +109,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: 'Check out repository' - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: 'Set vars' shell: bash @@ -131,7 +131,7 @@ jobs: run: ./mvnw clean verify -Psource-distribution -N -B -ntp -e - name: 'Upload artifact' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: artifacts path: | @@ -144,21 +144,21 @@ jobs: steps: - name: 'Check out repository' - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: 'Download all build artifacts' - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 - name: 'Set up Java' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ env.JAVA_VERSION }} distribution: 'zulu' - name: 'Cache Maven packages' - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} From 458116e0868b63bd9744b42b1199347e58ac113d Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Thu, 18 Apr 2024 21:04:24 +0200 Subject: [PATCH 2/8] Apply update here as well --- .github/workflows/release.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5d3916227..2943158ae 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -26,7 +26,6 @@ on: - '*' env: - GRAALVM_VERSION: '22.3.1' JAVA_VERSION: '17' jobs: @@ -53,8 +52,8 @@ jobs: - name: 'Set up Graal' uses: graalvm/setup-graalvm@v1 with: - version: ${{ env.GRAALVM_VERSION }} java-version: ${{ env.JAVA_VERSION }} + distribution: 'graalvm' components: 'native-image' github-token: ${{ secrets.GITHUB_TOKEN }} From 02be41ae337cf39a14cfda9a17a2641ec20c3ec0 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Thu, 18 Apr 2024 21:12:02 +0200 Subject: [PATCH 3/8] Graal on win needs latest Win? --- .github/workflows/early-access.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/early-access.yaml b/.github/workflows/early-access.yaml index e4423e114..7c50b663e 100644 --- a/.github/workflows/early-access.yaml +++ b/.github/workflows/early-access.yaml @@ -48,7 +48,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-22.04, macOS-11, windows-2019 ] + os: [ ubuntu, macos, windows ] runs-on: ${{ matrix.os }} steps: From 38d05d51304b329861c6aeeca970ade11e865996 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Thu, 18 Apr 2024 21:21:52 +0200 Subject: [PATCH 4/8] Add concurrency --- .github/workflows/early-access.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/early-access.yaml b/.github/workflows/early-access.yaml index 7c50b663e..ac98468b3 100644 --- a/.github/workflows/early-access.yaml +++ b/.github/workflows/early-access.yaml @@ -23,6 +23,10 @@ on: [push, pull_request] env: JAVA_VERSION: '17' +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: default-build: name: 'Default build (without Graal)' From 268da1962e4f567e9b84d69d79feb3321e88f3e1 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Thu, 18 Apr 2024 21:31:05 +0200 Subject: [PATCH 5/8] Add -V to see what maven is used --- .github/workflows/early-access.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/early-access.yaml b/.github/workflows/early-access.yaml index ac98468b3..5f4265587 100644 --- a/.github/workflows/early-access.yaml +++ b/.github/workflows/early-access.yaml @@ -37,7 +37,7 @@ jobs: uses: actions/checkout@v4 - name: 'Run default (non-native) build' - run: ./mvnw verify -Dmrm=false -B -ntp -e + run: ./mvnw verify -Dmrm=false -V -B -ntp -e - name: 'Upload daemon test logs' if: always() @@ -76,7 +76,7 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} - name: 'Maven clean' - run: ./mvnw clean -Dmrm=false -B -ntp -e + run: ./mvnw clean -Dmrm=false -V -B -ntp -e - name: 'Patch Graal libs for only requiring glibc 2.12' if: ${{ env.OS == 'linux' }} @@ -100,7 +100,7 @@ jobs: objcopy --redefine-syms=client/src/main/resources/glibc/glibc.redef client/target/graalvm-libs-for-glibc-2.12/Scrt1.o 2>/dev/null - name: 'Build native distribution' - run: ./mvnw verify -Pnative -Dmrm=false -B -ntp -e + run: ./mvnw verify -Pnative -Dmrm=false -V -B -ntp -e - name: 'Verify native binary for only requiring glibc 2.12' if: ${{ env.OS == 'linux' }} From b4a637cbe01bf19e09aa3fc7779e8b89bb283f90 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Thu, 18 Apr 2024 21:33:00 +0200 Subject: [PATCH 6/8] Use same Java version for def build --- .github/workflows/early-access.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/early-access.yaml b/.github/workflows/early-access.yaml index 5f4265587..f3779cf6a 100644 --- a/.github/workflows/early-access.yaml +++ b/.github/workflows/early-access.yaml @@ -36,6 +36,11 @@ jobs: - name: 'Checkout' uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + java-version: ${{ env.JAVA_VERSION }} + distribution: 'temurin' + - name: 'Run default (non-native) build' run: ./mvnw verify -Dmrm=false -V -B -ntp -e From 8c79eab609023c1c05560e87dfed0e7319b92d78 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Thu, 18 Apr 2024 23:46:08 +0200 Subject: [PATCH 7/8] Make all latest --- .github/workflows/early-access.yaml | 2 +- .github/workflows/release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/early-access.yaml b/.github/workflows/early-access.yaml index f3779cf6a..b8b1010a6 100644 --- a/.github/workflows/early-access.yaml +++ b/.github/workflows/early-access.yaml @@ -57,7 +57,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu, macos, windows ] + os: [ ubuntu-latest, macos-latest, windows-latest ] runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2943158ae..2da20e0c7 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -34,7 +34,7 @@ jobs: strategy: fail-fast: true matrix: - os: [ ubuntu-22.04, macOS-11, windows-2019 ] + os: [ ubuntu-latest, macos-latest, windows-latest ] runs-on: ${{ matrix.os }} steps: From 888b1ab1805c8b0a88b7fa000dc7cffa33df4372 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Fri, 19 Apr 2024 14:51:27 +0200 Subject: [PATCH 8/8] Apply @gzm55 advice --- client/src/main/resources/glibc/glibc.redef | 1 + 1 file changed, 1 insertion(+) diff --git a/client/src/main/resources/glibc/glibc.redef b/client/src/main/resources/glibc/glibc.redef index 103421598..e2ca74d79 100644 --- a/client/src/main/resources/glibc/glibc.redef +++ b/client/src/main/resources/glibc/glibc.redef @@ -28,6 +28,7 @@ pthread_create pthread_create@GLIBC_2.2.5 pthread_getattr_np pthread_getattr_np@GLIBC_2.2.5 pthread_join pthread_join@GLIBC_2.2.5 pthread_kill pthread_kill@GLIBC_2.2.5 +pthread_mutex_trylock pthread_mutex_trylock@GLIBC_2.2.5 pthread_setname_np pthread_setname_np@GLIBC_2.12 sem_destroy sem_destroy@GLIBC_2.2.5 sem_init sem_init@GLIBC_2.2.5