Skip to content

Commit eb264ad

Browse files
visrCopilot
andauthored
Put Julia directly in the Pixi environment (#1017)
* Put Julia directly in the Pixi environment https://prefix.dev/channels/julia-forge/packages/julia * Don't assume juliaup in VSCode * Pin Julia to the julia-forge channel Prevent future lockfile updates from selecting a Julia package from another configured channel. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent f88a521 commit eb264ad

8 files changed

Lines changed: 191 additions & 159 deletions

File tree

.github/workflows/CI.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ jobs:
3333
- uses: prefix-dev/setup-pixi@a09b6247153796b190642a2b53fac4241043cf6f # v0.10.0
3434
with:
3535
pixi-version: "latest"
36-
- name: Prepare pixi
37-
run: pixi run install-julia
3836
- name: Test Wflow
3937
run: |
4038
pixi run test-wflow-cov

.github/workflows/CIWflowServer.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ jobs:
3030
- uses: prefix-dev/setup-pixi@a09b6247153796b190642a2b53fac4241043cf6f # v0.10.0
3131
with:
3232
pixi-version: "latest"
33-
- name: Prepare pixi
34-
run: pixi run install-julia
3533
- name: Test WflowServer
3634
run: |
3735
pixi run test-wflow-server

.github/workflows/julia-auto-update.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ jobs:
1717
pixi-version: "latest"
1818
- name: Update Julia manifest
1919
run: |
20-
pixi run install-julia
2120
pixi run update-registry-julia
2221
pixi run update-manifest-julia
2322
env:

.github/workflows/parameter_metadata_json_gen.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ jobs:
1515
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
1616
- uses: julia-actions/cache@a45e8fa8be21c18a06b7177052533149e61e9b38 # v3.1.0
1717
- uses: prefix-dev/setup-pixi@a09b6247153796b190642a2b53fac4241043cf6f # v0.10.0
18-
- name: prepare pixi
19-
run: pixi run install-julia
2018
- name: Test parameter metadata JSON generation
2119
run: pixi run parameter_metadata_json_gen
2220
- name: Ensure that there was no change in the metadata

.github/workflows/update-sbom.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ jobs:
1818
with:
1919
pixi-version: "latest"
2020
- name: Install Julia and update SBOM file
21-
run: |
22-
pixi run install-julia
23-
pixi run generate-sbom
21+
run: pixi run generate-sbom
2422
env:
2523
JULIA_PKG_PRECOMPILE_AUTO: "0"
2624
- uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1

.vscode/settings.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,5 @@
1313
},
1414
"[markdown]": {
1515
"rewrap.wordWrapColumn": 92
16-
},
17-
"julia.executablePath": "julia +1.12.6"
16+
}
1817
}

pixi.lock

Lines changed: 184 additions & 144 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pixi.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ authors = [
66
"Hofer-Julian <julian.hofer@deltares.nl>",
77
"Bart de Koning <bart.dekoning@deltares.nl>",
88
]
9-
channels = ["conda-forge"]
9+
channels = ["conda-forge", "https://prefix.dev/julia-forge"]
1010
platforms = ["win-64", "linux-64"]
1111

1212
[tasks]
1313
# Installation
1414
# Julia
15+
# Note: this is for developers to have their global julia use the right version.
16+
# Use `pixi run julia` for the package used by CI.
1517
install-julia = "juliaup add 1.12.6 && juliaup override set 1.12.6"
1618
# Prek
1719
install-prek = "prek install --overwrite"
@@ -58,7 +60,7 @@ test-wflow-server = { cmd = "julia --project=server --eval 'using Pkg; Pkg.test(
5860
instantiate-formatting = { cmd = "julia --project=utils/formatting --eval 'using Pkg; Pkg.instantiate(); using JuliaFormatter'" }
5961
format-code = { cmd = "julia --project=utils/formatting --eval 'using JuliaFormatter; format(isempty(ARGS) ? \".\" : ARGS) || exit(1)'" }
6062
# Docs
61-
install-ci = { depends-on = ["install-julia", "update-registry-julia"] }
63+
install-ci = { depends-on = ["update-registry-julia"] }
6264
quarto-check = { cmd = "quarto check all" }
6365
quarto-render = { cmd = "julia --project=docs --eval 'using Pkg; Pkg.build(\"IJulia\")' && quarto render docs --to html --execute" }
6466
quarto-preview = { cmd = "quarto preview docs" }
@@ -76,7 +78,7 @@ inputs = ["Manifest.toml"]
7678
outputs = ["Wflow.spdx.json"]
7779

7880
[dependencies]
79-
juliaup = "*"
81+
julia = { version = "==1.12.6", channel = "https://prefix.dev/julia-forge" }
8082
python = ">=3.10"
8183
jupyter = ">=1.1.1,<2"
8284
quarto = ">=1.8.26,<2"

0 commit comments

Comments
 (0)