Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cumulative update of GH flow #950

Merged
merged 8 commits into from
Apr 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 21 additions & 16 deletions .github/workflows/early-access.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,35 @@
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)'
if: startsWith(github.event.head_commit.message, '[release] Release ') != true
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
Expand All @@ -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
Expand All @@ -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' }}
Expand All @@ -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' }}
Expand All @@ -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
21 changes: 10 additions & 11 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ on:
- '*'

env:
GRAALVM_VERSION: '22.3.1'
JAVA_VERSION: '17'

jobs:
Expand All @@ -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
Expand All @@ -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 }}

Expand Down Expand Up @@ -95,7 +94,7 @@ jobs:
(( err == 1 ))

- name: 'Upload artifact'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: artifacts
path: |
Expand All @@ -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
Expand All @@ -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: |
Expand All @@ -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') }}
Expand Down
1 change: 1 addition & 0 deletions client/src/main/resources/glibc/glibc.redef
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down