From b5255812bb9f206ff637dee297ce06b59489b608 Mon Sep 17 00:00:00 2001 From: Simon Exner <43469235+0815Creeper@users.noreply.github.com> Date: Mon, 23 Dec 2024 07:37:44 +0100 Subject: [PATCH] action version bumps (#75) * action version bumps * fix PkgEval Xvfb error * enable julia caching * formatted * added caching to eval action * fixed mac os arch warning in test actions --------- Co-authored-by: Simon Exner <0815Creeper@users.noreply.github.com> --- .github/workflows/Eval.yml | 14 +++++++++++--- .github/workflows/TestLTS.yml | 20 +++++++++++++++----- .github/workflows/TestLatest.yml | 22 ++++++++++++++++------ src/FMI3/cconst.jl | 1 - src/FMI3/cfunc.jl | 1 - test/FMI2/utils.jl | 1 - 6 files changed, 42 insertions(+), 17 deletions(-) diff --git a/.github/workflows/Eval.yml b/.github/workflows/Eval.yml index a160936..80e2bdb 100644 --- a/.github/workflows/Eval.yml +++ b/.github/workflows/Eval.yml @@ -18,21 +18,29 @@ jobs: julia-arch: [x64] steps: + # Required by PkgEval.jl as xvfb runs into issues with ubuntu 24. See ci.yml workflow of PkgEval.jl repo + - name: "Allow unprivileged user namespaces" + run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0 + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - name: Check out repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 # Set up Julia - name: "Set up Julia" - uses: julia-actions/setup-julia@v1 + uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.julia-version }} arch: ${{ matrix.julia-arch }} id: version + # Set up julia-cache + - name: Set up julia-cache + uses: julia-actions/cache@v2 + # Set up cache - name: "Set up cache" - uses: actions/cache@v2 + uses: actions/cache@v4 env: cache-name: cache-artifacts with: diff --git a/.github/workflows/TestLTS.yml b/.github/workflows/TestLTS.yml index 8e201f0..fb08c09 100644 --- a/.github/workflows/TestLTS.yml +++ b/.github/workflows/TestLTS.yml @@ -18,29 +18,39 @@ jobs: strategy: fail-fast: false matrix: - julia-version: ['1.6'] - julia-arch: [x64, x86] + julia-version: ['lts'] + julia-arch: [x64, x86, aarch64] os: [ubuntu-latest, windows-latest, macOS-latest] experimental: [false] exclude: + - os: ubuntu-latest + julia-arch: aarch64 + - os: windows-latest + julia-arch: aarch64 + - os: macOS-latest + julia-arch: x64 - os: macOS-latest julia-arch: x86 steps: # Checks-out your repository - name: Check out repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Set up Julia - name: "Set up Julia" - uses: julia-actions/setup-julia@v1 + uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.julia-version }} arch: ${{ matrix.julia-arch }} + # Set up julia-cache + - name: Set up julia-cache + uses: julia-actions/cache@v2 + # Set up cache - name: "Set up cache" - uses: actions/cache@v3 + uses: actions/cache@v4 env: cache-name: cache-artifacts with: diff --git a/.github/workflows/TestLatest.yml b/.github/workflows/TestLatest.yml index 880e200..a281e8a 100644 --- a/.github/workflows/TestLatest.yml +++ b/.github/workflows/TestLatest.yml @@ -19,28 +19,38 @@ jobs: fail-fast: false matrix: julia-version: ['1'] # "1" automatically expands to the latest stable 1.x release of Julia - julia-arch: [x64, x86] + julia-arch: [x64, x86, aarch64] os: [ubuntu-latest, windows-latest, macOS-latest] experimental: [false] exclude: + - os: ubuntu-latest + julia-arch: aarch64 + - os: windows-latest + julia-arch: aarch64 + - os: macOS-latest + julia-arch: x64 - os: macOS-latest julia-arch: x86 steps: # Checks-out your repository - name: Check out repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Set up Julia - name: "Set up Julia" - uses: julia-actions/setup-julia@v1 + uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.julia-version }} arch: ${{ matrix.julia-arch }} + # Set up julia-cache + - name: Set up julia-cache + uses: julia-actions/cache@v2 + # Set up cache - name: "Set up cache" - uses: actions/cache@v3 + uses: actions/cache@v4 env: cache-name: cache-artifacts with: @@ -65,8 +75,8 @@ jobs: # Run codecov - name: "Run CodeCov" - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: - file: lcov.info + files: lcov.info diff --git a/src/FMI3/cconst.jl b/src/FMI3/cconst.jl index 08ecbd5..638e8aa 100644 --- a/src/FMI3/cconst.jl +++ b/src/FMI3/cconst.jl @@ -489,4 +489,3 @@ export fmi3DependencyKind, fmi3DependencyKindTunable, fmi3DependencyKindDiscrete, fmi3DependencyKindDependent - diff --git a/src/FMI3/cfunc.jl b/src/FMI3/cfunc.jl index 801a49c..ac7ec88 100644 --- a/src/FMI3/cfunc.jl +++ b/src/FMI3/cfunc.jl @@ -2136,4 +2136,3 @@ function fmi3DoStep!( return status end export fmi3DoStep! - diff --git a/test/FMI2/utils.jl b/test/FMI2/utils.jl index e60cf1e..dc9971c 100644 --- a/test/FMI2/utils.jl +++ b/test/FMI2/utils.jl @@ -177,4 +177,3 @@ function fmi2CallbackLogger( return nothing end -