apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-11 05:30:08 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Cumulative update of GH flow (#950)

Browse Source 
Changes:
* Cumulative update of GH flow
* Graal update
* Add concurrency
* Add -V to see what maven is used
* Use same Java version for def build
* Apply @gzm55 advice
This commit is contained in:
Tamas Cservenak
2024-04-19 15:23:45 +02:00
committed by GitHub
parent d23e0e88f6
commit 8bb26402c1
3 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
.github/workflows/early-access.yaml vendored
View File

@@ -18,15 +18,15 @@
name: Early Access name: Early Access
# trigger on push to branches and PR # trigger on push to branches and PR
on: on: [push, pull_request]
push:
branch:
pull_request:
env: env:
GRAALVM_VERSION: '22.3.1'
JAVA_VERSION: '17' JAVA_VERSION: '17'
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs: jobs:
default-build: default-build:
name: 'Default build (without Graal)' name: 'Default build (without Graal)'
@@ -34,14 +34,19 @@ jobs:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- name: 'Checkout' - 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' - 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' - name: 'Upload daemon test logs'
if: always() if: always()
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: daemon-test-logs-default-build name: daemon-test-logs-default-build
path: integration-tests/target/mvnd-tests/**/daemon*.log path: integration-tests/target/mvnd-tests/**/daemon*.log
@@ -52,12 +57,12 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ ubuntu-22.04, macOS-11, windows-2019 ] os: [ ubuntu-latest, macos-latest, windows-latest ]
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- name: 'Checkout' - name: 'Checkout'
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: 'Set vars' - name: 'Set vars'
shell: bash shell: bash
@@ -70,13 +75,13 @@ jobs:
- name: 'Set up Graal' - name: 'Set up Graal'
uses: graalvm/setup-graalvm@v1 uses: graalvm/setup-graalvm@v1
with: with:
version: ${{ env.GRAALVM_VERSION }}
java-version: ${{ env.JAVA_VERSION }} java-version: ${{ env.JAVA_VERSION }}
distribution: 'graalvm'
components: 'native-image' components: 'native-image'
github-token: ${{ secrets.GITHUB_TOKEN }} github-token: ${{ secrets.GITHUB_TOKEN }}
- name: 'Maven clean' - 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' - name: 'Patch Graal libs for only requiring glibc 2.12'
if: ${{ env.OS == 'linux' }} 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 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' - 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' - name: 'Verify native binary for only requiring glibc 2.12'
if: ${{ env.OS == 'linux' }} if: ${{ env.OS == 'linux' }}
@@ -113,19 +118,19 @@ jobs:
- name: 'Upload daemon test logs' - name: 'Upload daemon test logs'
if: always() if: always()
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: daemon-test-logs-${{ env.OS }} name: daemon-test-logs-${{ env.OS }}
path: integration-tests/target/mvnd-tests/**/daemon*.log path: integration-tests/target/mvnd-tests/**/daemon*.log
- name: 'Upload m39 artifact' - name: 'Upload m39 artifact'
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: mvnd-m39-${{ env.OS }} name: mvnd-m39-${{ env.OS }}
path: dist-m39/target/maven-mvnd-*.zip path: dist-m39/target/maven-mvnd-*.zip
- name: 'Upload m40 artifact' - name: 'Upload m40 artifact'
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: mvnd-m40-${{ env.OS }} name: mvnd-m40-${{ env.OS }}
path: dist-m40/target/maven-mvnd-*.zip path: dist-m40/target/maven-mvnd-*.zip

21
.github/workflows/release.yaml vendored
View File

@@ -26,7 +26,6 @@ on:
- '*' - '*'
env: env:
GRAALVM_VERSION: '22.3.1'
JAVA_VERSION: '17' JAVA_VERSION: '17'
jobs: jobs:
@@ -35,12 +34,12 @@ jobs:
strategy: strategy:
fail-fast: true fail-fast: true
matrix: matrix:
os: [ ubuntu-22.04, macOS-11, windows-2019 ] os: [ ubuntu-latest, macos-latest, windows-latest ]
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- name: 'Check out repository' - name: 'Check out repository'
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: 'Set vars' - name: 'Set vars'
shell: bash shell: bash
@@ -53,8 +52,8 @@ jobs:
- name: 'Set up Graal' - name: 'Set up Graal'
uses: graalvm/setup-graalvm@v1 uses: graalvm/setup-graalvm@v1
with: with:
version: ${{ env.GRAALVM_VERSION }}
java-version: ${{ env.JAVA_VERSION }} java-version: ${{ env.JAVA_VERSION }}
distribution: 'graalvm'
components: 'native-image' components: 'native-image'
github-token: ${{ secrets.GITHUB_TOKEN }} github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -95,7 +94,7 @@ jobs:
(( err == 1 )) (( err == 1 ))
- name: 'Upload artifact' - name: 'Upload artifact'
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: artifacts name: artifacts
path: | path: |
@@ -109,7 +108,7 @@ jobs:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- name: 'Check out repository' - name: 'Check out repository'
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: 'Set vars' - name: 'Set vars'
shell: bash shell: bash
@@ -131,7 +130,7 @@ jobs:
run: ./mvnw clean verify -Psource-distribution -N -B -ntp -e run: ./mvnw clean verify -Psource-distribution -N -B -ntp -e
- name: 'Upload artifact' - name: 'Upload artifact'
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: artifacts name: artifacts
path: | path: |
@@ -144,21 +143,21 @@ jobs:
steps: steps:
- name: 'Check out repository' - name: 'Check out repository'
uses: actions/checkout@v3 uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
- name: 'Download all build artifacts' - name: 'Download all build artifacts'
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
- name: 'Set up Java' - name: 'Set up Java'
uses: actions/setup-java@v3 uses: actions/setup-java@v4
with: with:
java-version: ${{ env.JAVA_VERSION }} java-version: ${{ env.JAVA_VERSION }}
distribution: 'zulu' distribution: 'zulu'
- name: 'Cache Maven packages' - name: 'Cache Maven packages'
uses: actions/cache@v3 uses: actions/cache@v4
with: with:
path: ~/.m2 path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

1
client/src/main/resources/glibc/glibc.redef
View File

@@ -28,6 +28,7 @@ pthread_create pthread_create@GLIBC_2.2.5
pthread_getattr_np pthread_getattr_np@GLIBC_2.2.5 pthread_getattr_np pthread_getattr_np@GLIBC_2.2.5
pthread_join pthread_join@GLIBC_2.2.5 pthread_join pthread_join@GLIBC_2.2.5
pthread_kill pthread_kill@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 pthread_setname_np pthread_setname_np@GLIBC_2.12
sem_destroy sem_destroy@GLIBC_2.2.5 sem_destroy sem_destroy@GLIBC_2.2.5
sem_init sem_init@GLIBC_2.2.5 sem_init sem_init@GLIBC_2.2.5