Skip to content

Commit 1abe866

Browse files
committed
Don't update SBOM in Julia manifest update
Don't run `pixi run generate-sbom`. The `update-sbom.yml` workflow is triggered automatically when Manifest.toml changes on master. That will keep the SBOM up to date, whether the Manifest.toml changes due to the automated Julia update or a manual merge to main. Also removes the deprecated system-requirements section, I don't think we still need this. ``` WARN Encountered 1 warning while parsing the manifest: ⚠ the `[system-requirements]` table is deprecated in favor of virtual packages on `platforms` ╭─[C:\ProgramData\DevDrive\.julia\dev\Wflow\pixi.toml:86:1] 85 │ 86 │ ╭─▶ [system-requirements] 87 │ ├─▶ linux = "3.10.0" · ╰──── declare these on the `platforms` entries instead ╰──── help: e.g. platforms = [{ platform = "linux-64", cuda = "12" }] ``` Also adds `--overwrite` to `prek install`. Otherwise it will not remove the old hooks, which no longer work. I got this: ``` ✨ Pixi task (install-prek): prek install Hook already exists at `.git\hooks\pre-commit`, moved it to `.git\hooks\pre-commit.legacy` Migration mode: prek will also run legacy hook `.git\hooks\pre-commit.legacy`. Use `--overwrite` to remove legacy hooks. prek installed at `.git\hooks\pre-commit` ```
1 parent 0695e2d commit 1abe866

2 files changed

Lines changed: 1 addition & 5 deletions

File tree

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ jobs:
2020
pixi run install-julia
2121
pixi run update-registry-julia
2222
pixi run update-manifest-julia
23-
pixi run generate-sbom
2423
env:
2524
JULIA_PKG_PRECOMPILE_AUTO: "0"
2625
- uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1

pixi.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ platforms = ["win-64", "linux-64"]
1414
# Julia
1515
install-julia = "juliaup add 1.12.6 && juliaup override set 1.12.6"
1616
# Prek
17-
install-prek = "prek install"
17+
install-prek = "prek install --overwrite"
1818
update-registry-julia = "julia --eval='using Pkg; Registry.update()'"
1919
update-manifest-julia = "julia --project utils/update-manifest.jl"
2020
initialize-julia = { depends-on = [
@@ -82,6 +82,3 @@ jupyter = ">=1.1.1,<2"
8282
quarto = ">=1.8.26,<2"
8383
prek = "*"
8484
typos = "*"
85-
86-
[system-requirements]
87-
linux = "3.10.0"

0 commit comments

Comments
 (0)