diff --git a/.github/workflows/early-access.yaml b/.github/workflows/early-access.yaml index 40fe719e3..b8b1010a6 100644 --- a/.github/workflows/early-access.yaml +++ b/.github/workflows/early-access.yaml @@ -18,15 +18,15 @@ 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' +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: default-build: name: 'Default build (without Graal)' @@ -34,14 +34,19 @@ jobs: runs-on: ubuntu-22.04 steps: - name: 'Checkout' - uses: actions/checkout@v3 + 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 -B -ntp -e + run: ./mvnw verify -Dmrm=false -V -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 @@ -52,12 +57,12 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-22.04, macOS-11, windows-2019 ] + os: [ ubuntu-latest, macos-latest, windows-latest ] runs-on: ${{ matrix.os }} steps: - name: 'Checkout' - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: 'Set vars' shell: bash @@ -70,13 +75,13 @@ 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 }} - 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 +105,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' }} @@ -113,19 +118,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..2da20e0c7 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: @@ -35,12 +34,12 @@ 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: - name: 'Check out repository' - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: 'Set vars' shell: bash @@ -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 }} @@ -95,7 +94,7 @@ jobs: (( err == 1 )) - name: 'Upload artifact' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: artifacts path: | @@ -109,7 +108,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 +130,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 +143,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') }} 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