Skip to content

Commit

Permalink
Merge #45
Browse files Browse the repository at this point in the history
45: Upgrade Flux and Julia r=charleskawczynski a=charleskawczynski

This PR upgrades the Flux and Julia versions

Co-authored-by: Charles Kawczynski <[email protected]>
  • Loading branch information
bors[bot] and charleskawczynski authored Sep 28, 2023
2 parents 380e6f3 + a6095f8 commit acfb18b
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fail-fast: false
matrix:
version:
- '1.7.0'
- '1.9'
os:
- ubuntu-latest
- macOS-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/julia_formatter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OperatorFlux"
uuid = "47cfafe2-3833-4da3-8183-ce14c2b92cbd"
authors = ["CliMA Contributors <[email protected]>"]
version = "0.1.2"
version = "0.1.3"

[deps]
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
Expand All @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions bors.toml
Original file line number Diff line number Diff line change
@@ -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"
]
Expand Down

0 comments on commit acfb18b

Please sign in to comment.