diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml index 05c9f76a9..db295c482 100644 --- a/.github/workflows/core_tests.yml +++ b/.github/workflows/core_tests.yml @@ -15,13 +15,11 @@ permissions: contents: read jobs: test: - name: Julia ${{ matrix.julia_version }} - ${{ matrix.os }} - ${{ matrix.arch }} + name: Julia ${{ matrix.os }} - ${{ matrix.arch }} runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: - julia_version: - - "~1.10.0-0" os: - ubuntu-latest # https://github.com/Deltares/Ribasim/issues/825 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 3e6b6d4a2..ccfc83f5b 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,16 +14,10 @@ permissions: contents: read jobs: publish: - name: Docs Julia ${{ matrix.julia_version }} - ${{ matrix.arch }} + name: Docs Julia runs-on: ubuntu-latest permissions: contents: write - strategy: - matrix: - julia_version: - - "~1.10.0-0" - arch: - - x64 steps: - uses: actions/checkout@v4 - uses: julia-actions/cache@v1 diff --git a/Manifest.toml b/Manifest.toml index 50ef3d8d0..4f6519041 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -1,8 +1,8 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.10.0-rc2" +julia_version = "1.10.0" manifest_format = "2.0" -project_hash = "e92257faf6a6264eb6078cd603308efd2e42b380" +project_hash = "d7ee772a6ce028def5673f584203e74ddba25b58" [[deps.ADTypes]] git-tree-sha1 = "332e5d7baeff8497b923b730b994fa480601efc7" @@ -1458,7 +1458,7 @@ deps = ["Libdl", "LinearAlgebra", "Serialization", "SparseArrays"] uuid = "4607b0f0-06f3-5cda-b6b1-a6196a1729e9" [[deps.SuiteSparse_jll]] -deps = ["Artifacts", "Libdl", "Pkg", "libblastrampoline_jll"] +deps = ["Artifacts", "Libdl", "libblastrampoline_jll"] uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c" version = "7.2.1+1" diff --git a/pixi.toml b/pixi.toml index 87b248240..968e5fd53 100644 --- a/pixi.toml +++ b/pixi.toml @@ -14,7 +14,7 @@ repository = "https://github.com/Deltares/Ribasim" [tasks] # Installation -install-julia = "juliaup add 1.10.0-rc2 && juliaup default 1.10.0-rc2" +install-julia = "juliaup add 1.10 && juliaup default 1.10" install-ribasim-python = "pip install --no-deps --editable python/ribasim" install-ribasim-api = "pip install --no-deps --editable python/ribasim_api" install-ribasim-testmodels = "pip install --no-deps --editable python/ribasim_testmodels"