diff --git a/.github/workflows/ExportPluto.yaml b/.github/workflows/ExportPluto.yaml index e7c4c8ae..c9ccb688 100644 --- a/.github/workflows/ExportPluto.yaml +++ b/.github/workflows/ExportPluto.yaml @@ -20,10 +20,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout this repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Install Julia - uses: julia-actions/setup-julia@v2 + uses: julia-actions/setup-julia@v3 with: version: "1.12" @@ -45,7 +45,7 @@ jobs: - name: Run & export Pluto notebooks run: | julia -e 'using Pkg - Pkg.activate("pluto-slider-server-environment") + Pkg.activate("pluto-deployment-environment") Pkg.instantiate() import PlutoSliderServer diff --git a/.github/workflows/NotebookDifference.yaml b/.github/workflows/NotebookDifference.yaml index 999b1a6d..721d0394 100644 --- a/.github/workflows/NotebookDifference.yaml +++ b/.github/workflows/NotebookDifference.yaml @@ -15,21 +15,21 @@ jobs: runs-on: ubuntu-24.04 steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: fetch-depth: 0 path: source - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: ref: gh-pages path: gh_pages_dir - name: Install Julia - uses: julia-actions/setup-julia@v2 + uses: julia-actions/setup-julia@v3 with: # note: this version should match the version in the other actions in this repo version: "1.12" diff --git a/developer instructions/infrastructure.md b/developer instructions/infrastructure.md index 1258ec84..a25fadf0 100644 --- a/developer instructions/infrastructure.md +++ b/developer instructions/infrastructure.md @@ -59,7 +59,7 @@ I modified the `/usr/local/bin/pluto-slider-server.sh` script to use JSON loggin export JULIA_PKG_USE_CLI_GIT=true cd /home/fplasvande/BMLIP-course -julia --project="pluto-slider-server-environment" -e "import Pkg; Pkg.instantiate(); using LoggingFormats, LoggingExtras; global_logger(FormatLogger(LoggingFormats.JSON(), stderr)); import PlutoSliderServer; PlutoSliderServer.run_git_directory(\".\")" +julia --project="pluto-deployment-environment" -e "import Pkg; Pkg.instantiate(); using LoggingFormats, LoggingExtras; global_logger(FormatLogger(LoggingFormats.JSON(), stderr)); import PlutoSliderServer; PlutoSliderServer.run_git_directory(\".\")" ``` @@ -70,9 +70,9 @@ julia --project="pluto-slider-server-environment" -e "import Pkg; Pkg.instantiat Vector.yaml: -``` +```yaml -# Forwarding logs to S1215127.eu-nbg-2.betterstackdata.com +# Forwarding logs to s1509838.eu-nbg-2.betterstackdata.com # -------------------------------------------------------- # Generated on 2025-02-24: https://telemetry.betterstack.com/vector-yaml/ubuntu/TOKENHIDDEN # Learn more about Vector configuration: https://vector.dev/docs/reference/configuration/ diff --git a/pluto-slider-server-environment/Manifest.toml b/pluto-deployment-environment/Manifest.toml similarity index 100% rename from pluto-slider-server-environment/Manifest.toml rename to pluto-deployment-environment/Manifest.toml diff --git a/pluto-slider-server-environment/PlutoDeployment.toml b/pluto-deployment-environment/PlutoDeployment.toml similarity index 100% rename from pluto-slider-server-environment/PlutoDeployment.toml rename to pluto-deployment-environment/PlutoDeployment.toml diff --git a/pluto-slider-server-environment/Project.toml b/pluto-deployment-environment/Project.toml similarity index 100% rename from pluto-slider-server-environment/Project.toml rename to pluto-deployment-environment/Project.toml diff --git a/tools/combine_pkg_envs.jl b/tools/combine_pkg_envs.jl index 43f81424..a815994f 100644 --- a/tools/combine_pkg_envs.jl +++ b/tools/combine_pkg_envs.jl @@ -1,4 +1,4 @@ -if !isdir("pluto-slider-server-environment") || length(ARGS) != 1 +if !isdir("pluto-deployment-environment") || length(ARGS) != 1 error(""" Run me from the root of the repository directory, using: @@ -11,7 +11,7 @@ end update = parse(Bool, ARGS[1]) import Pkg -Pkg.activate("./pluto-slider-server-environment") +Pkg.activate("./pluto-deployment-environment") Pkg.instantiate() import Pluto ENV["JULIA_PKG_PRECOMPILE_AUTO"] = 0 diff --git a/tools/diff.jl b/tools/diff.jl index 22c889a9..a1cf6a21 100644 --- a/tools/diff.jl +++ b/tools/diff.jl @@ -22,7 +22,7 @@ end cd(source) using Pkg -Pkg.activate(joinpath(source, "pluto-slider-server-environment")) +Pkg.activate(joinpath(source, "pluto-deployment-environment")) Pkg.instantiate() using PlutoNotebookComparison diff --git a/tools/generate_pdf.jl b/tools/generate_pdf.jl index cb6b9a54..8f27815e 100644 --- a/tools/generate_pdf.jl +++ b/tools/generate_pdf.jl @@ -1,4 +1,4 @@ -if !isdir("pluto-slider-server-environment") +if !isdir("pluto-deployment-environment") error(""" Run me from the root of the repository directory, using: @@ -19,7 +19,7 @@ end import Pkg project = mktempdir() -cp("./pluto-slider-server-environment", project; force=true) +cp("./pluto-deployment-environment", project; force=true) Pkg.activate(project) Pkg.add(["URIs", "PlutoPDF"]) Pkg.instantiate() diff --git a/tools/update_notebook_packages.jl b/tools/update_notebook_packages.jl index 22f9dc13..5250f070 100644 --- a/tools/update_notebook_packages.jl +++ b/tools/update_notebook_packages.jl @@ -1,20 +1,23 @@ -if !isdir("pluto-slider-server-environment") || length(ARGS) != 2 +if !isdir("pluto-deployment-environment") || length(ARGS) != 2 error(""" Run me from the root of the repository directory, using: julia tools/update_notebook_packages.jl Where is one of: PATCH, MINOR, MAJOR - And is true or false to run all notebooks with Pluto at the end + And is true or false to run all notebooks with Pluto at the end. This will ensure that cells are stored in the correct order. """) end -if !(v"1.12.0-aaa" < VERSION < v"1.13.0") - error("Our notebook package environments need to be updated with Julia 1.12. Go to julialang.org/downloads to install it.") +begin + import TOML + manifest_version = TOML.parsefile("./pluto-deployment-environment/Manifest.toml")["julia_version"] + + @assert manifest_version == string(VERSION) "This repository uses Julia version $(manifest_version) (in pluto-deployment-environment), but this is Julia $(VERSION). Start a new Julia session with the correct version, or create a new Manifest.toml." end import Pkg -Pkg.activate("./pluto-slider-server-environment") +Pkg.activate("./pluto-deployment-environment") Pkg.instantiate() import Pluto