From aa2141d2d7a52d09fe6401e36e053ac2fd1fd9d4 Mon Sep 17 00:00:00 2001 From: Alexander Plavin Date: Sat, 15 Mar 2025 08:30:35 -0400 Subject: [PATCH 1/8] update CI jobs --- .github/workflows/CI.yml | 24 ++++++++++++------------ .github/workflows/Downstream.yml | 13 +++++++------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index f70b68b..4667860 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -10,27 +10,27 @@ jobs: name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} runs-on: ${{ matrix.os }} strategy: - fail-fast: true matrix: version: - '1.0' - - '1.3' - - '1.5' - '1.6' - - '1.7' + - '1.10' - '1' - - 'nightly' os: - ubuntu-latest - macOS-latest - windows-latest - arch: - - x64 + exclude: + - os: macOS-latest # Apple Silicon + version: '1.0' + - os: macOS-latest # Apple Silicon + version: '1.6' steps: - - uses: actions/checkout@v2 - - uses: julia-actions/setup-julia@v1 + - uses: actions/checkout@v4 + - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.version }} - arch: ${{ matrix.arch }} - - uses: julia-actions/julia-buildpkg@latest - - uses: julia-actions/julia-runtest@latest + arch: 'default' + - uses: julia-actions/cache@v2 + - uses: julia-actions/julia-buildpkg@v1 + - uses: julia-actions/julia-runtest@v1 diff --git a/.github/workflows/Downstream.yml b/.github/workflows/Downstream.yml index 805c696..c5dc11c 100644 --- a/.github/workflows/Downstream.yml +++ b/.github/workflows/Downstream.yml @@ -10,13 +10,13 @@ jobs: strategy: fail-fast: false matrix: - julia-version: [1.6, 1, nightly] + julia-version: [1.6, 1.10, 1] os: [ubuntu-latest] package: - - {repo: JuliaObjects/Accessors.jl} - - {repo: JuliaFolds/BangBang.jl} - - {repo: jw3126/Setfield.jl} - - {repo: rafaqz/Flatten.jl} + - Accessors + - BangBang + - Setfield + - Flatten steps: - uses: actions/checkout@v2 - uses: julia-actions/setup-julia@v1 @@ -29,13 +29,14 @@ jobs: with: repository: ${{ matrix.package.repo }} path: downstream - - name: Load this and run the downstream tests + - name: Install downstream and run its tests shell: julia --color=yes --project=downstream {0} run: | using Pkg try # force it to use this PR's version of the package Pkg.develop(PackageSpec(path=".")) # resolver may fail with main deps + Pkg.add("${{ matrix.package }}") Pkg.update() Pkg.test(coverage=true) # resolver may fail with test time deps catch err From 957d8ff5c65d1dd5bc25d426ba8bad6c17eedc9e Mon Sep 17 00:00:00 2001 From: Alexander Plavin Date: Sat, 15 Mar 2025 08:33:40 -0400 Subject: [PATCH 2/8] fix --- .github/workflows/Downstream.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/Downstream.yml b/.github/workflows/Downstream.yml index c5dc11c..89bef24 100644 --- a/.github/workflows/Downstream.yml +++ b/.github/workflows/Downstream.yml @@ -24,16 +24,12 @@ jobs: version: ${{ matrix.julia-version }} arch: x64 - uses: julia-actions/julia-buildpkg@latest - - name: Clone Downstream - uses: actions/checkout@v2 - with: - repository: ${{ matrix.package.repo }} - path: downstream - name: Install downstream and run its tests - shell: julia --color=yes --project=downstream {0} + shell: julia --color=yes {0} run: | using Pkg try + Pkg.activate("downstream") # force it to use this PR's version of the package Pkg.develop(PackageSpec(path=".")) # resolver may fail with main deps Pkg.add("${{ matrix.package }}") From 402ad52bc804e297e0d5481602bd74267ff34ba7 Mon Sep 17 00:00:00 2001 From: Alexander Plavin Date: Sat, 15 Mar 2025 08:35:15 -0400 Subject: [PATCH 3/8] fix --- .github/workflows/Downstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Downstream.yml b/.github/workflows/Downstream.yml index 89bef24..66b4c10 100644 --- a/.github/workflows/Downstream.yml +++ b/.github/workflows/Downstream.yml @@ -34,7 +34,7 @@ jobs: Pkg.develop(PackageSpec(path=".")) # resolver may fail with main deps Pkg.add("${{ matrix.package }}") Pkg.update() - Pkg.test(coverage=true) # resolver may fail with test time deps + Pkg.test("${{ matrix.package }}", coverage=true) # resolver may fail with test time deps catch err err isa Pkg.Resolve.ResolverError || rethrow() # If we can't resolve that means this is incompatible by SemVer and this is fine From f2efa7ac1fe4f335e215a26555d34052d4fc452f Mon Sep 17 00:00:00 2001 From: Alexander Plavin Date: Sat, 15 Mar 2025 08:37:29 -0400 Subject: [PATCH 4/8] run only on master push --- .github/workflows/CI.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 4667860..cc7bd90 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -1,7 +1,9 @@ name: CI on: - - push - - pull_request + push: + branches: + - master + pull_request: defaults: run: shell: bash From 56dbd6d9f6eb13267025bd45932949ffb83810b6 Mon Sep 17 00:00:00 2001 From: Alexander Plavin Date: Sat, 15 Mar 2025 08:37:59 -0400 Subject: [PATCH 5/8] run only on master push --- .github/workflows/Downstream.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/Downstream.yml b/.github/workflows/Downstream.yml index 66b4c10..1ef66d5 100644 --- a/.github/workflows/Downstream.yml +++ b/.github/workflows/Downstream.yml @@ -1,6 +1,8 @@ name: IntegrationTest on: push: + branches: + - master pull_request: jobs: From f4abd54ff6ec9d31fcbd0f496e9e03c956d36a82 Mon Sep 17 00:00:00 2001 From: Alexander Plavin Date: Sat, 15 Mar 2025 08:39:10 -0400 Subject: [PATCH 6/8] fix job name --- .github/workflows/Downstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Downstream.yml b/.github/workflows/Downstream.yml index 1ef66d5..ecf5026 100644 --- a/.github/workflows/Downstream.yml +++ b/.github/workflows/Downstream.yml @@ -7,7 +7,7 @@ on: jobs: test: - name: ${{ matrix.package.repo }}/${{ matrix.julia-version }} + name: ${{ matrix.package }}/${{ matrix.julia-version }} runs-on: ${{ matrix.os }} strategy: fail-fast: false From a458cd4b2c342695724c40359a5fcd88e25ac5e8 Mon Sep 17 00:00:00 2001 From: Alexander Plavin Date: Sat, 15 Mar 2025 08:39:53 -0400 Subject: [PATCH 7/8] fix version --- .github/workflows/Downstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Downstream.yml b/.github/workflows/Downstream.yml index ecf5026..f68c3c9 100644 --- a/.github/workflows/Downstream.yml +++ b/.github/workflows/Downstream.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - julia-version: [1.6, 1.10, 1] + julia-version: ['1.6', '1.10', '1'] os: [ubuntu-latest] package: - Accessors From a3a6560873d8399b95ecd5ee19dbded851e84fa1 Mon Sep 17 00:00:00 2001 From: Alexander Plavin Date: Sat, 15 Mar 2025 10:43:22 -0400 Subject: [PATCH 8/8] upd --- .github/workflows/RunTestsNoIncrementalPrecompile.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/RunTestsNoIncrementalPrecompile.yml b/.github/workflows/RunTestsNoIncrementalPrecompile.yml index 3f831d8..1b1341d 100644 --- a/.github/workflows/RunTestsNoIncrementalPrecompile.yml +++ b/.github/workflows/RunTestsNoIncrementalPrecompile.yml @@ -1,6 +1,8 @@ -name: CI +name: NoCompModules on: - - push + push: + branches: + - master - pull_request defaults: run: