From 54d273c3379887a406e735bad0ff51a949b99084 Mon Sep 17 00:00:00 2001
From: Maarten Pronk <git@evetion.nl>
Date: Fri, 15 Nov 2024 11:17:39 +0100
Subject: [PATCH 1/2] Drop support for 1.6.

---
 .github/workflows/CI.yml           | 2 +-
 .github/workflows/CompatHelper.yml | 2 +-
 Project.toml                       | 2 +-
 README.md                          | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index c60c1158..142ebea4 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.6'
+          - '1.10'  # lts
           - '1'
           - 'nightly'
         os:
diff --git a/.github/workflows/CompatHelper.yml b/.github/workflows/CompatHelper.yml
index e80a42c9..1b56746c 100644
--- a/.github/workflows/CompatHelper.yml
+++ b/.github/workflows/CompatHelper.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: julia-actions/setup-julia@latest
         with:
-          version: 1.6
+          version: 1.10
       - name: Pkg.add("CompatHelper")
         run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
       - name: CompatHelper.main()
diff --git a/Project.toml b/Project.toml
index 7041685b..5b821b3a 100644
--- a/Project.toml
+++ b/Project.toml
@@ -42,7 +42,7 @@ ImageCore = "0.8, 0.9, 0.10"
 Makie = "0.20, 0.21"
 Tables = "1"
 JLD2 = "0.4, 0.5"
-julia = "1.6"
+julia = "1.10"
 
 [extras]
 Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
diff --git a/README.md b/README.md
index 94a04cda..02e90ac0 100644
--- a/README.md
+++ b/README.md
@@ -72,11 +72,11 @@ $ julia --project
 3. Activate the environment corresponding to `Project.toml`):
 
 ```julia
-(@v1.6) pkg> activate .
-  Activating environment at `~/.julia/environments/v1.6/Project.toml`
+(@v1.10) pkg> activate .
+  Activating environment at `~/.julia/environments/v1.10/Project.toml`
 ```
 
-4. Manage the dependencies using Pkg in https://pkgdocs.julialang.org/v1.6/managing-packages/, e.g.
+4. Manage the dependencies using Pkg in https://pkgdocs.julialang.org/v1.10/managing-packages/, e.g.
 
 ```julia
 (ArchGDAL) pkg> st

From 3587eaa49faa3ef94052c45bfc74ee151cc28f35 Mon Sep 17 00:00:00 2001
From: Maarten Pronk <git@evetion.nl>
Date: Fri, 15 Nov 2024 17:43:51 +0100
Subject: [PATCH 2/2] Update CI definition.

---
 .github/workflows/CI.yml | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 142ebea4..962ded94 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -5,6 +5,10 @@ on:
     branches:
       - master
     tags: '*'
+# needed to allow julia-actions/cache to delete old caches that it has created
+permissions:
+  actions: write
+  contents: read
 jobs:
   test:
     name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
@@ -13,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.10'  # lts
+          - 'lts'  # lts
           - '1'
           - 'nightly'
         os:
@@ -24,20 +28,11 @@ jobs:
           - x64
     steps:
       - uses: actions/checkout@v4
-      - uses: julia-actions/setup-julia@v1
+      - uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
-      - uses: actions/cache@v4
-        env:
-          cache-name: cache-artifacts
-        with:
-          path: ~/.julia/artifacts
-          key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-test-${{ env.cache-name }}-
-            ${{ runner.os }}-test-
-            ${{ runner.os }}-
+      - uses: julia-actions/cache@v2
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
       - uses: julia-actions/julia-processcoverage@v1
@@ -52,9 +47,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: julia-actions/setup-julia@latest
+      - uses: julia-actions/setup-julia@v2
         with:
-          version: '1'
+          version: 'lts'
       - name: Install dependencies
         run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
       - name: Fetch files for documentation examples