From 7f0897ea9881b638b954ff47253f79843a28c66c Mon Sep 17 00:00:00 2001 From: Charles Kawczynski Date: Thu, 28 Sep 2023 15:48:06 -0700 Subject: [PATCH 1/2] Upgrade julia and Flux --- .github/workflows/Docs.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/julia_formatter.yml | 2 +- Project.toml | 2 +- bors.toml | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/Docs.yml b/.github/workflows/Docs.yml index 56c5acc..22e9ab2 100644 --- a/.github/workflows/Docs.yml +++ b/.github/workflows/Docs.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v2 - uses: julia-actions/setup-julia@latest with: - version: 1.7 + version: 1.9 - name: Install dependencies run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()' - name: Build and deploy diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7de7555..49a43da 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: version: - - '1.7.0' + - '1.9' os: - ubuntu-latest - macOS-latest diff --git a/.github/workflows/julia_formatter.yml b/.github/workflows/julia_formatter.yml index d11ea03..60194aa 100644 --- a/.github/workflows/julia_formatter.yml +++ b/.github/workflows/julia_formatter.yml @@ -31,7 +31,7 @@ jobs: - uses: julia-actions/setup-julia@latest if: steps.filter.outputs.julia_file_change == 'true' with: - version: 1.7.0 + version: 1.9 - name: Apply JuliaFormatter if: steps.filter.outputs.julia_file_change == 'true' diff --git a/Project.toml b/Project.toml index d788f4b..24b50b0 100644 --- a/Project.toml +++ b/Project.toml @@ -18,7 +18,7 @@ ChainRulesCore = "1" ChainRulesTestUtils = "1" Distributions = "0.25" FFTW = "1" -Flux = "0.13" +Flux = "0.13, 0.14" GaussQuadrature = "0.5" Tullio = "0.3" julia = "1.7" diff --git a/bors.toml b/bors.toml index e14b110..93dec5c 100644 --- a/bors.toml +++ b/bors.toml @@ -1,7 +1,7 @@ status = [ - "ci 1.7.0 - ubuntu-latest", - "ci 1.7.0 - windows-latest", - "ci 1.7.0 - macOS-latest", + "ci 1.9 - ubuntu-latest", + "ci 1.9 - windows-latest", + "ci 1.9 - macOS-latest", "format", "docbuild" ] From a6095f88e83d177da3aff0f8d43d15124ae07d3f Mon Sep 17 00:00:00 2001 From: Charles Kawczynski Date: Thu, 28 Sep 2023 15:48:17 -0700 Subject: [PATCH 2/2] Bump compat --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 24b50b0..c3fd80a 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "OperatorFlux" uuid = "47cfafe2-3833-4da3-8183-ce14c2b92cbd" authors = ["CliMA Contributors "] -version = "0.1.2" +version = "0.1.3" [deps] ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"