From 9cb4227c304b94e69492d43c663d5e41f341188b Mon Sep 17 00:00:00 2001 From: Anant Thazhemadam Date: Mon, 29 Apr 2024 19:20:32 +0530 Subject: [PATCH 1/6] ci: update invalidations workflow to use centralised reusable workflow --- .github/workflows/Invalidations.yml | 33 ++++------------------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/.github/workflows/Invalidations.yml b/.github/workflows/Invalidations.yml index 66c86a362..34eb7a92a 100644 --- a/.github/workflows/Invalidations.yml +++ b/.github/workflows/Invalidations.yml @@ -1,4 +1,4 @@ -name: Invalidations +name: "Invalidations" on: pull_request: @@ -10,31 +10,6 @@ concurrency: cancel-in-progress: true jobs: - evaluate: - # Only run on PRs to the default branch. - # In the PR trigger above branches can be specified only explicitly whereas this check should work for master, main, or any other default branch - if: github.base_ref == github.event.repository.default_branch - runs-on: ubuntu-latest - steps: - - uses: julia-actions/setup-julia@v2 - with: - version: '1' - - uses: actions/checkout@v4 - - uses: julia-actions/julia-buildpkg@v1 - - uses: julia-actions/julia-invalidations@v1 - id: invs_pr - - - uses: actions/checkout@v4 - with: - ref: ${{ github.event.repository.default_branch }} - - uses: julia-actions/julia-buildpkg@v1 - - uses: julia-actions/julia-invalidations@v1 - id: invs_default - - - name: Report invalidation counts - run: | - echo "Invalidations on default branch: ${{ steps.invs_default.outputs.total }} (${{ steps.invs_default.outputs.deps }} via deps)" >> $GITHUB_STEP_SUMMARY - echo "This branch: ${{ steps.invs_pr.outputs.total }} (${{ steps.invs_pr.outputs.deps }} via deps)" >> $GITHUB_STEP_SUMMARY - - name: Check if the PR does increase number of invalidations - if: steps.invs_pr.outputs.total > steps.invs_default.outputs.total - run: exit 1 + evaluate-invalidations: + name: "Evaluate Invalidations" + uses: "SciML/.github/.github/workflows/invalidations.yml@v1" From 81ec6a4bd5a6013a046f02ad951619c8ecb26b29 Mon Sep 17 00:00:00 2001 From: Anant Thazhemadam Date: Mon, 29 Apr 2024 19:37:37 +0530 Subject: [PATCH 2/6] ci: update format check workflow to use centralised reusable workflow --- .github/workflows/FormatCheck.yml | 37 ++++--------------------------- 1 file changed, 4 insertions(+), 33 deletions(-) diff --git a/.github/workflows/FormatCheck.yml b/.github/workflows/FormatCheck.yml index 45bd09c47..7e46c8db9 100644 --- a/.github/workflows/FormatCheck.yml +++ b/.github/workflows/FormatCheck.yml @@ -1,42 +1,13 @@ -name: format-check +name: "Format Check" on: push: branches: - 'main' - - 'release-' tags: '*' pull_request: jobs: - build: - runs-on: ${{ matrix.os }} - strategy: - matrix: - julia-version: [1] - julia-arch: [x86] - os: [ubuntu-latest] - steps: - - uses: julia-actions/setup-julia@latest - with: - version: ${{ matrix.julia-version }} - - - uses: actions/checkout@v4 - - name: Install JuliaFormatter and format - # This will use the latest version by default but you can set the version like so: - # - # julia -e 'using Pkg; Pkg.add(PackageSpec(name="JuliaFormatter", version="0.13.0"))' - run: | - julia -e 'using Pkg; Pkg.add(PackageSpec(name="JuliaFormatter"))' - julia -e 'using JuliaFormatter; format(".", verbose=true)' - - name: Format check - run: | - julia -e ' - out = Cmd(`git diff --name-only`) |> read |> String - if out == "" - exit(0) - else - @error "Some files have not been formatted !!!" - write(stdout, out) - exit(1) - end' + format-check: + name: "Format Check" + uses: "SciML/.github/.github/workflows/format-check.yml@v1" From b28210d2e8c307771c8cebf12a1708eb195278ed Mon Sep 17 00:00:00 2001 From: Anant Thazhemadam Date: Tue, 30 Apr 2024 11:14:14 +0530 Subject: [PATCH 3/6] ci: update documentation workflow to use centralised reusable workflow --- .github/workflows/Documentation.yml | 33 ++++++++--------------------- 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/.github/workflows/Documentation.yml b/.github/workflows/Documentation.yml index ea914acea..785116ee5 100644 --- a/.github/workflows/Documentation.yml +++ b/.github/workflows/Documentation.yml @@ -1,33 +1,18 @@ -name: Documentation +name: "Documentation" on: push: branches: - main - - 'release-' tags: '*' pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ github.ref_name != github.event.repository.default_branch || github.ref != 'refs/tags/v*' }} + jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: julia-actions/setup-julia@latest - with: - version: '1' - - name: Install dependencies - run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()' - - name: Build and deploy - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # For authentication with GitHub Actions token - DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # For authentication with SSH deploy key - run: julia --project=docs/ --code-coverage=user docs/make.jl - - uses: julia-actions/julia-processcoverage@v1 - with: - directories: src - - uses: codecov/codecov-action@v4 - with: - files: lcov.info - token: ${{ secrets.CODECOV_TOKEN }} - fail_ci_if_error: true + build-and-deploy-docs: + name: "Documentation" + uses: "SciML/.github/.github/workflows/documentation.yml@v1" + secrets: "inherit" From 374b3baa363e9910c8d2fe86c5bbc38c1e3c6463 Mon Sep 17 00:00:00 2001 From: Anant Thazhemadam Date: Wed, 31 Jul 2024 23:28:31 +0200 Subject: [PATCH 4/6] ci: update tests workflow to use centralized reusable workflow --- .github/workflows/CI.yml | 56 ------------------------------------- .github/workflows/Tests.yml | 38 +++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 56 deletions(-) delete mode 100644 .github/workflows/CI.yml create mode 100644 .github/workflows/Tests.yml diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml deleted file mode 100644 index 1a82b49da..000000000 --- a/.github/workflows/CI.yml +++ /dev/null @@ -1,56 +0,0 @@ -name: CI -on: - pull_request: - branches: - - main - paths-ignore: - - 'docs/**' - push: - branches: - - main - paths-ignore: - - 'docs/**' -jobs: - test: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - group: - - Core - version: - - '1' - include: - - version: '1' - group: 'LinearSolveHYPRE' - - version: '1' - group: 'LinearSolvePardiso' - - version: '1' - group: 'LinearSolveBandedMatrices' - steps: - - uses: actions/checkout@v4 - - uses: julia-actions/setup-julia@v2 - with: - version: ${{ matrix.version }} - - uses: actions/cache@v4 - env: - cache-name: cache-artifacts - 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 }}- - - uses: julia-actions/julia-buildpkg@v1 - - uses: julia-actions/julia-runtest@v1 - env: - GROUP: ${{ matrix.group }} - - uses: julia-actions/julia-processcoverage@v1 - with: - directories: src,ext - - uses: codecov/codecov-action@v4 - with: - files: lcov.info - token: ${{ secrets.CODECOV_TOKEN }} - fail_ci_if_error: true diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml new file mode 100644 index 000000000..b85feb422 --- /dev/null +++ b/.github/workflows/Tests.yml @@ -0,0 +1,38 @@ +name: "Tests" + +on: + pull_request: + branches: + - main + - 'release-' + paths-ignore: + - 'docs/**' + push: + branches: + - main + paths-ignore: + - 'docs/**' + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ github.ref_name != github.event.repository.default_branch || github.ref != 'refs/tags/v*' }} + +jobs: + tests: + name: "Tests" + strategy: + fail-fast: false + matrix: + version: + - "1" + - "lts" + group: + - "Core" + - "LinearSolveHYPRE" + - "LinearSolvePardiso" + - "LinearSolveBandedMatrices" + uses: "SciML/.github/.github/workflows/tests.yml@v1" + with: + group: "${{ matrix.group }}" + julia-version: "${{ matrix.version }}" + secrets: "inherit" From 0b7a8650885d03cd634c71e47fe8e26a817a9e7f Mon Sep 17 00:00:00 2001 From: Anant Thazhemadam Date: Wed, 31 Jul 2024 23:28:42 +0200 Subject: [PATCH 5/6] ci(format-check): automatically comment formatting suggestions on PRs --- .github/workflows/FormatCheck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/FormatCheck.yml b/.github/workflows/FormatCheck.yml index 7e46c8db9..fe9c1280f 100644 --- a/.github/workflows/FormatCheck.yml +++ b/.github/workflows/FormatCheck.yml @@ -10,4 +10,4 @@ on: jobs: format-check: name: "Format Check" - uses: "SciML/.github/.github/workflows/format-check.yml@v1" + uses: "SciML/.github/.github/workflows/format-suggestions-on-pr.yml@v1" From 02dab42d232de9fe0b3ba8b3152870e4bd7c8e7b Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Wed, 31 Jul 2024 19:11:16 -0400 Subject: [PATCH 6/6] Update pardiso.jl --- test/pardiso/pardiso.jl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/pardiso/pardiso.jl b/test/pardiso/pardiso.jl index d244c4e33..a961a53d7 100644 --- a/test/pardiso/pardiso.jl +++ b/test/pardiso/pardiso.jl @@ -57,21 +57,21 @@ prob = LinearProblem(copy(A), copy(b1)) linsolve = init(prob, UMFPACKFactorization()) -sol11 = solve(linsolve) +sol11 = solve!(linsolve) linsolve = LinearSolve.set_b(sol11.cache, copy(b2)) -sol12 = solve(linsolve) +sol12 = solve!(linsolve) linsolve = LinearSolve.set_A(sol12.cache, copy(A2)) -sol13 = solve(linsolve) +sol13 = solve!(linsolve) for alg in algs linsolve = init(prob, alg) - sol31 = solve(linsolve) + sol31 = solve!(linsolve) linsolve = LinearSolve.set_b(sol31.cache, copy(b2)) - sol32 = solve(linsolve) + sol32 = solve!(linsolve) linsolve = LinearSolve.set_A(sol32.cache, copy(A2)) - sol33 = solve(linsolve) + sol33 = solve!(linsolve) @test sol11.u ≈ sol31.u @test sol12.u ≈ sol32.u @test sol13.u ≈ sol33.u