From 5080dacb58b44c9672f02c98152f3c6effa61216 Mon Sep 17 00:00:00 2001 From: ArnoStrouwen Date: Mon, 13 May 2024 12:40:02 +0200 Subject: [PATCH 1/2] various CI improvements --- .github/workflows/CI.yml | 33 ++++++++++++++--------------- .github/workflows/Documentation.yml | 3 ++- .github/workflows/Downgrade.yml | 23 ++++++++++++++++---- .github/workflows/Downstream.yml | 33 ++++++++++++++++++++++------- 4 files changed, 62 insertions(+), 30 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 1a82b49da..661aa4c53 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -10,42 +10,41 @@ on: - main paths-ignore: - 'docs/**' + schedule: + - cron: '20 17 * * 0' jobs: test: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} + env: + GROUP: ${{ matrix.group }} strategy: fail-fast: false matrix: group: - Core + - LinearSolveHYPRE + - LinearSolvePardiso + - LinearSolveBandedMatrices version: - '1' - include: - - version: '1' - group: 'LinearSolveHYPRE' - - version: '1' - group: 'LinearSolvePardiso' - - version: '1' - group: 'LinearSolveBandedMatrices' + os: + - ubuntu-latest + - macos-latest + - windows-latest steps: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.version }} - - uses: actions/cache@v4 - env: - cache-name: cache-artifacts + - uses: julia-actions/cache@v1 with: - path: ~/.julia/artifacts - key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }} - restore-keys: | - ${{ runner.os }}-test-${{ env.cache-name }}- - ${{ runner.os }}-test- - ${{ runner.os }}- + token: ${{ secrets.GITHUB_TOKEN }} - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-runtest@v1 env: GROUP: ${{ matrix.group }} + with: + depwarn: error - uses: julia-actions/julia-processcoverage@v1 with: directories: src,ext diff --git a/.github/workflows/Documentation.yml b/.github/workflows/Documentation.yml index ea914acea..fbbbe7161 100644 --- a/.github/workflows/Documentation.yml +++ b/.github/workflows/Documentation.yml @@ -7,7 +7,8 @@ on: - 'release-' tags: '*' pull_request: - + schedule: + - cron: '20 17 * * 0' jobs: build: runs-on: ubuntu-latest diff --git a/.github/workflows/Downgrade.yml b/.github/workflows/Downgrade.yml index ccfa12ae9..2e7f17aa3 100644 --- a/.github/workflows/Downgrade.yml +++ b/.github/workflows/Downgrade.yml @@ -10,22 +10,37 @@ on: - main paths-ignore: - 'docs/**' + schedule: + - cron: '20 17 * * 0' jobs: test: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} + env: + GROUP: ${{ matrix.group }} strategy: + fail-fast: false matrix: - version: ['1'] group: - Core + - LinearSolveHYPRE + - LinearSolvePardiso + - LinearSolveBandedMatrices + version: + - '1' + os: + - ubuntu-latest + - macos-latest + - windows-latest steps: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.version }} - uses: julia-actions/julia-downgrade-compat@v1 -# if: ${{ matrix.version == '1.6' }} with: skip: Pkg,TOML + - uses: julia-actions/cache@v1 + with: + token: ${{ secrets.GITHUB_TOKEN }} - uses: julia-actions/julia-buildpkg@v1 - - uses: julia-actions/julia-runtest@v1 + - uses: julia-actions/julia-runtest@v1 \ No newline at end of file diff --git a/.github/workflows/Downstream.yml b/.github/workflows/Downstream.yml index 38615772c..c83ab3a9e 100644 --- a/.github/workflows/Downstream.yml +++ b/.github/workflows/Downstream.yml @@ -1,33 +1,50 @@ name: IntegrationTest on: - push: - branches: [main] - tags: [v*] pull_request: + branches: + - main + paths-ignore: + - 'docs/**' + push: + branches: + - main + tags: + - v* + paths-ignore: + - 'docs/**' + schedule: + - cron: '20 17 * * 0' jobs: test: - name: ${{ matrix.package.repo }}/${{ matrix.package.group }}/${{ matrix.julia-version }} + name: ${{ matrix.package.repo }}/${{ matrix.package.group }}/${{ matrix.version }} runs-on: ${{ matrix.os }} env: GROUP: ${{ matrix.package.group }} strategy: fail-fast: false matrix: - julia-version: [1] - os: [ubuntu-latest] package: - {user: SciML, repo: OrdinaryDiffEq.jl, group: InterfaceII} - {user: SciML, repo: ModelingToolkit.jl, group: All} - {user: SciML, repo: SciMLSensitivity.jl, group: Core1} - {user: SciML, repo: BoundaryValueDiffEq.jl, group: All} - {user: SciML, repo: NonlinearSolve.jl, group: All} + version: + - '1' + os: + - ubuntu-latest + - macos-latest + - windows-latest steps: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2 with: - version: ${{ matrix.julia-version }} + version: ${{ matrix.version }} arch: x64 + - uses: julia-actions/cache@v1 + with: + token: ${{ secrets.GITHUB_TOKEN }} - uses: julia-actions/julia-buildpkg@latest - name: Clone Downstream uses: actions/checkout@v4 @@ -35,7 +52,7 @@ jobs: repository: ${{ matrix.package.user }}/${{ matrix.package.repo }} path: downstream - name: Load this and run the downstream tests - shell: julia --color=yes --project=downstream {0} + shell: julia --color=yes --depwarn=error --project=downstream {0} run: | using Pkg try From 7ccafb06887c9d44c6bea879a782d64f7c0f9ce1 Mon Sep 17 00:00:00 2001 From: ArnoStrouwen Date: Fri, 17 May 2024 19:00:45 +0200 Subject: [PATCH 2/2] Fix mpiexec deprecation in tests --- test/hypretests.jl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/hypretests.jl b/test/hypretests.jl index c41079c1c..da7e7e3a5 100644 --- a/test/hypretests.jl +++ b/test/hypretests.jl @@ -168,7 +168,5 @@ test_interface(HYPREAlgorithm(HYPRE.PCG(comm)), Pl = HYPRE.BoomerAMG()) # Test MPI execution mpitestfile = joinpath(@__DIR__, "hypretests_mpi.jl") -mpiexec() do mpi - r = run(ignorestatus(`$(mpi) -n 2 $(Base.julia_cmd()) $(mpitestfile)`)) - @test r.exitcode == 0 -end +r = run(ignorestatus(`$(mpiexec()) -n 2 $(Base.julia_cmd()) $(mpitestfile)`)) +@test r.exitcode == 0