From ffcf858773420880235f6ba6058fec29176240ac Mon Sep 17 00:00:00 2001
From: Ian Butterworth <i.r.butterworth@gmail.com>
Date: Tue, 29 Oct 2024 16:57:29 -0400
Subject: [PATCH 1/2] strip out tree_hash for stdlibs that have have been freed
 in newer julia versions (#4062)

* strip out tree_hash for stdlibs that have have been freed in newer julia versions

* Update src/Operations.jl

(cherry picked from commit 9f8e11a4c0efb3b68a1e25a33f372f398c89cd66)
---
 src/Operations.jl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Operations.jl b/src/Operations.jl
index f53eec7f0b..e52fd43f6e 100644
--- a/src/Operations.jl
+++ b/src/Operations.jl
@@ -202,6 +202,13 @@ end
 ####################
 
 function load_tree_hash!(registries::Vector{Registry.RegistryInstance}, pkg::PackageSpec, julia_version)
+    if is_stdlib(pkg.uuid, julia_version) && pkg.tree_hash !== nothing
+        # manifests from newer julia versions might have stdlibs that are upgradable (FORMER_STDLIBS)
+        # that have tree_hash recorded, which we need to clear for this version where they are not upgradable
+        # given regular stdlibs don't have tree_hash recorded
+        pkg.tree_hash = nothing
+        return pkg
+    end
     tracking_registered_version(pkg, julia_version) || return pkg
     hash = nothing
     for reg in registries

From 6886c9eb76f0e5639af8fd2d3e09260a597fb4de Mon Sep 17 00:00:00 2001
From: Ian Butterworth <i.r.butterworth@gmail.com>
Date: Tue, 29 Oct 2024 21:50:59 -0400
Subject: [PATCH 2/2] update julia version in CI

---
 .github/workflows/test.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9f8ade3c86..c99b1759b7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,7 +35,7 @@ jobs:
         pkg-server:
           - "pkg.julialang.org" # Default to this for all except specific cases
         julia-version:
-          - 'nightly'
+          - '1.11'
         exclude:
           - os: ubuntu-latest
             julia-arch: aarch64
@@ -48,11 +48,11 @@ jobs:
         include:
           - os: ubuntu-latest
             julia-arch: 'x64'
-            julia-version: 'nightly'
+            julia-version: '1.11'
             pkg-server: ""
           - os: ubuntu-latest
             julia-arch: 'x64'
-            julia-version: 'nightly'
+            julia-version: '1.11'
             pkg-server: "pkg.julialang.org"
     steps:
       - name: Set git to use LF and fix TEMP on windows
@@ -93,7 +93,7 @@ jobs:
       - uses: julia-actions/setup-julia@v2
         with:
           # version: '1.6'
-          version: 'nightly'
+          version: '1.11'
       - name: Generate docs
         run: |
           julia --project --color=yes -e 'using Pkg; Pkg.activate("docs"); Pkg.instantiate(); Pkg.develop(PackageSpec(path = pwd()))'