From eba53011cadc0cb9c7fc2361ba36534e9ac77627 Mon Sep 17 00:00:00 2001 From: Arno Strouwen Date: Thu, 4 Jan 2024 16:02:11 +0100 Subject: [PATCH] more CI OS and error on deprecation warnings --- .github/workflows/CI.yml | 17 ++++++++--------- .github/workflows/Downgrade.yml | 15 ++++++++++++--- .github/workflows/Downstream.yml | 28 ++++++++++++++++++++-------- test/runtests.jl | 12 +++--------- 4 files changed, 43 insertions(+), 29 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c53fecd..1c3aa06 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -19,23 +19,22 @@ jobs: - Core version: - '1' + os: + - ubuntu-latest + - macos-latest + - windows-latest steps: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v1 with: version: ${{ matrix.version }} - - uses: actions/cache@v3 - 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 + with: + depwarn: error - uses: julia-actions/julia-processcoverage@v1 - uses: codecov/codecov-action@v3 with: diff --git a/.github/workflows/Downgrade.yml b/.github/workflows/Downgrade.yml index be85e50..c906870 100644 --- a/.github/workflows/Downgrade.yml +++ b/.github/workflows/Downgrade.yml @@ -15,17 +15,26 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: ['1'] group: - Core + version: + - '1' + os: + - ubuntu-latest + - macos-latest + - windows-latest steps: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v1 with: version: ${{ matrix.version }} - uses: cjdoris/julia-downgrade-compat-action@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 \ No newline at end of file + - uses: julia-actions/julia-runtest@v1 + with: + depwarn: error \ No newline at end of file diff --git a/.github/workflows/Downstream.yml b/.github/workflows/Downstream.yml index 1fb89d3..553d62a 100644 --- a/.github/workflows/Downstream.yml +++ b/.github/workflows/Downstream.yml @@ -1,9 +1,15 @@ name: IntegrationTest on: - push: - branches: [master] - tags: [v*] pull_request: + branches: + - master + paths-ignore: + - 'docs/**' + push: + branches: + - master + paths-ignore: + - 'docs/**' jobs: test: @@ -14,28 +20,34 @@ jobs: strategy: fail-fast: false matrix: - julia-version: [1] - os: [ubuntu-latest] package: - {user: SciML, repo: OrdinaryDiffEq.jl, group: InterfaceI} - {user: SciML, repo: OrdinaryDiffEq.jl, group: InterfaceII} - {user: SciML, repo: OrdinaryDiffEq.jl, group: InterfaceIII} - {user: SciML, repo: OrdinaryDiffEq.jl, group: InterfaceIV} - {user: SciML, repo: OrdinaryDiffEq.jl, group: InterfaceV} + version: + - '1' + os: + - ubuntu-latest + - macos-latest + - windows-latest steps: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v1 with: - version: ${{ matrix.julia-version }} - arch: x64 + version: ${{ matrix.version }} - uses: julia-actions/julia-buildpkg@latest - name: Clone Downstream uses: actions/checkout@v4 with: repository: ${{ matrix.package.user }}/${{ matrix.package.repo }} path: downstream + - uses: julia-actions/cache@v1 + with: + token: ${{ secrets.GITHUB_TOKEN }} - 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 diff --git a/test/runtests.jl b/test/runtests.jl index 320c0da..24710fe 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -12,18 +12,12 @@ end @time begin if GROUP == "All" || GROUP == "Core" - @time @safetestset "Quality Assurance" begin - include("qa.jl") - end - @time @safetestset "Basic Tests" begin - include("basictests.jl") - end + @time @safetestset "Quality Assurance" include("qa.jl") + @time @safetestset "Basic Tests" include("basictests.jl") end if GROUP == "GPU" activate_gpu_env() - @time @safetestset "GPU Tests" begin - include("gpu/gputests.jl") - end + @time @safetestset "GPU Tests" include("gpu/gputests.jl") end end