CI: bump to ubuntu-24.04 (except deploy); bump stack/cabal to latest (#…

…7261) * CI: bump to ubuntu-24.04 (except deploy); bump stack/cabal to latest * CI user-manual: install imagemagick for ubuntu-24.04 actions/runner-images#9848 (comment)
agda · May 14, 2024 · cc78a51 · cc78a51
1 parent 1c449e2
commit cc78a51
Show file tree

Hide file tree

Showing 18 changed files with 50 additions and 48 deletions.
diff --git a/.github/workflows/cabal-install.yml b/.github/workflows/cabal-install.yml
@@ -24,7 +24,7 @@ jobs:
     env:
       FLAGS: -O0 -f enable-cluster-counting
     needs: auto-cancel
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - name: Set up cabal
@@ -59,7 +59,7 @@ jobs:
     - name: Install Agda
       run: |
         cabal install ${FLAGS}
-    - if: ${{ always() && (steps.cache.outputs.cache-hit != 'true') }}
+    - if: always() && steps.cache.outputs.cache-hit != 'true'
       name: Save cache
       uses: actions/cache/save@v4
       with:

diff --git a/.github/workflows/cabal.yml b/.github/workflows/cabal.yml
@@ -122,24 +122,24 @@ jobs:
           description: Linux doctest
           doctest: true
           ghc-ver: 9.8.2
-          os: ubuntu-22.04
+          os: ubuntu-24.04
         - cabal-flags: --enable-tests -f debug
           description: Linux debug
           ghc-ver: 9.8.2
-          os: ubuntu-22.04
+          os: ubuntu-24.04
         - cabal-flags: --enable-tests -f enable-cluster-counting -f debug -f debug-serialisation
             -f debug-parsing -c containers>=0.7 --allow-newer=containers
           description: Linux containers 0.7
           ghc-ver: 9.8.2
-          os: ubuntu-22.04
+          os: ubuntu-24.04
         - description: macOS
           ghc-ver: 9.8.2
           os: macos-12
         - description: Windows
           ghc-ver: 9.8.2
           os: windows-2022
         os:
-        - ubuntu-22.04
+        - ubuntu-24.04
     timeout-minutes: 60
 name: Build (cabal)
 'on':

diff --git a/.github/workflows/haddock.yml b/.github/workflows/haddock.yml
@@ -21,7 +21,7 @@ jobs:
       uses: haskell-actions/setup@v2
       with:
         cabal-update: true
-        cabal-version: ${{ matrix.cabal-ver }}
+        cabal-version: latest
         ghc-version: ${{ matrix.ghc-ver }}
     - name: Configure the build plan
       run: |
@@ -60,12 +60,10 @@ jobs:
         publish_dir: html
     strategy:
       matrix:
-        cabal-ver:
-        - '3.10'
         ghc-ver:
         - 9.8.2
         os:
-        - ubuntu-22.04
+        - ubuntu-24.04
 name: Haddock
 'on':
   pull_request:

diff --git a/.github/workflows/stack-dry-run.yml b/.github/workflows/stack-dry-run.yml
@@ -56,7 +56,7 @@ jobs:
         - 8.10.7
         - 8.8.4
         os:
-        - ubuntu-latest
+        - ubuntu-24.04
         stack-ver:
         - latest
     timeout-minutes: 10

diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml
@@ -113,8 +113,8 @@ jobs:
         - ghc-ver: 9.8.2
           os: windows-2022
         os:
-        - ubuntu-22.04
-        - macos-12
+        - ubuntu-24.04
+        - macos-14
     timeout-minutes: 60
 name: Build (stack)
 'on':

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,7 +11,6 @@ env:
   GHC_VER: 9.8.2
   PARALLEL_TESTS: 2
   STACK: stack --system-ghc
-  STACK_VER: 2.13.1
   TASTY_ANSI_TRICKS: 'false'
 jobs:
   build:
@@ -20,7 +19,7 @@ jobs:
       && !contains(github.event.head_commit.message, '[ci skip]')
       && !contains(github.event.head_commit.message, '[github skip]')
       && !contains(github.event.head_commit.message, '[skip github]')
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - name: Info about the context
       run: |
@@ -42,7 +41,7 @@ jobs:
       with:
         enable-stack: true
         ghc-version: ${{ env.GHC_VER }}
-        stack-version: ${{ env.STACK_VER }}
+        stack-version: latest
     - name: Copy stack-${{ env.GHC_VER}}.yaml to stack.yaml
       run: cp stack-${{ env.GHC_VER }}.yaml stack.yaml
     - name: Determine the ICU version
@@ -93,7 +92,7 @@ jobs:
         path: ${{ steps.setup-haskell.outputs.stack-root }}
   cubical:
     needs: build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
       with:
@@ -103,7 +102,7 @@ jobs:
       with:
         enable-stack: true
         ghc-version: ${{ env.GHC_VER }}
-        stack-version: ${{ env.STACK_VER }}
+        stack-version: latest
     - uses: actions/download-artifact@v4
       with:
         name: agda-${{ runner.os }}-${{ github.sha }}
@@ -128,7 +127,7 @@ jobs:
       run: make BUILD_DIR="${GITHUB_WORKSPACE}/${BUILD_DIR}" cubical-succeed
   interaction-latex-html:
     needs: build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
       with:
@@ -138,7 +137,7 @@ jobs:
       with:
         enable-stack: true
         ghc-version: ${{ env.GHC_VER }}
-        stack-version: ${{ env.STACK_VER }}
+        stack-version: latest
     - uses: actions/download-artifact@v4
       with:
         name: agda-${{ runner.os }}-${{ github.sha }}
@@ -181,7 +180,7 @@ jobs:
       run: make BUILD_DIR="${GITHUB_WORKSPACE}/${BUILD_DIR}" interaction
   stdlib-test:
     needs: build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
       with:
@@ -191,7 +190,7 @@ jobs:
       with:
         enable-stack: true
         ghc-version: ${{ env.GHC_VER }}
-        stack-version: ${{ env.STACK_VER }}
+        stack-version: latest
     - uses: actions/download-artifact@v4
       with:
         name: agda-${{ runner.os }}-${{ github.sha }}
@@ -229,7 +228,7 @@ jobs:
       run: make BUILD_DIR="${GITHUB_WORKSPACE}/${BUILD_DIR}" std-lib-interaction
   test:
     needs: build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
       with:
@@ -239,7 +238,7 @@ jobs:
       with:
         enable-stack: true
         ghc-version: ${{ env.GHC_VER }}
-        stack-version: ${{ env.STACK_VER }}
+        stack-version: latest
     - uses: actions/download-artifact@v4
       with:
         name: agda-${{ runner.os }}-${{ github.sha }}

diff --git a/.github/workflows/user_manual.yml b/.github/workflows/user_manual.yml
@@ -8,15 +8,19 @@
 jobs:
   build:
     env:
-      python-version: '3.11'
+      python-version: '3.12'
     if: |
       !contains(github.event.head_commit.message, '[skip ci]')
       && !contains(github.event.head_commit.message, '[ci skip]')
       && !contains(github.event.head_commit.message, '[github skip]')
       && !contains(github.event.head_commit.message, '[skip github]')
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
+    - name: Install imagemagick (convert)
+      run: |
+        sudo apt-get update
+        sudo apt-get install imagemagick
     - name: Set up Python ${{ env.python-version }}
       uses: actions/setup-python@v5
       with:

diff --git a/.github/workflows/whitespace.yml b/.github/workflows/whitespace.yml
@@ -7,7 +7,7 @@
 ######################################################
 jobs:
   check:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - name: Checkout agda sources
       uses: actions/checkout@v4

diff --git a/src/github/workflows/cabal-install.yml b/src/github/workflows/cabal-install.yml
@@ -40,7 +40,7 @@ jobs:
 
     timeout-minutes: 60
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     ## Use preinstalled GHC and Cabal
     #
     # runs-on: ${{ matrix.os }}
@@ -122,7 +122,7 @@ jobs:
 
     - name: Save cache
       uses: actions/cache/save@v4
-      if:   ${{ always() && (steps.cache.outputs.cache-hit != 'true') }}
+      if:   always() && steps.cache.outputs.cache-hit != 'true'
             # save cache even when build fails
       with:
         key:  ${{ steps.cache.outputs.cache-primary-key }}

diff --git a/src/github/workflows/cabal.yml b/src/github/workflows/cabal.yml
@@ -48,7 +48,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04]
+        os: [ubuntu-24.04]
         description: [Linux]      ## This just for pretty-printing the job name.
         ghc-ver: [9.8.2, 9.6.5, 9.4.8, 9.2.8, 9.0.2, 8.10.7, 8.8.4, 8.6.5]
         # Need to mention "cabal-ver" at least once in the matrix, otherwise matrix.cabal-ver is an actionlint error.
@@ -59,21 +59,21 @@ jobs:
           ## Latest GHC, special builds
 
           # Linux, without tests but with doctest
-          - os: ubuntu-22.04
+          - os: ubuntu-24.04
             description: Linux doctest
             ghc-ver: '9.8.2'
             # Can't leave cabal-flags empty here lest it becomes the default value.
             cabal-flags: '--disable-tests'
             doctest: true
 
           # Linux, without -f enable-cluster-counting but with -f debug
-          - os: ubuntu-22.04
+          - os: ubuntu-24.04
             description: Linux debug
             ghc-ver: '9.8.2'
             cabal-flags: '--enable-tests -f debug'
 
           # Linux, with containers-0.7 and everything
-          - os: ubuntu-22.04
+          - os: ubuntu-24.04
             description: Linux containers 0.7
             ghc-ver: '9.8.2'
             ## Andreas, 2023-09-28: Test containers-0.7 here which has breaking changes.

diff --git a/src/github/workflows/haddock.yml b/src/github/workflows/haddock.yml
@@ -24,9 +24,8 @@ jobs:
         # since this often does not point at the latest version;
         # not for the virtual environments, and also haskell/action/setup
         # is usually not up-to-date.
-        os: [ubuntu-22.04]
+        os: [ubuntu-24.04]
         ghc-ver: ['9.8.2']
-        cabal-ver: ['3.10']
           # Use the versions the come with the virtual environment, if possible.
 
     if: |
@@ -50,7 +49,7 @@ jobs:
       id: setup-haskell
       with:
         ghc-version:   ${{ matrix.ghc-ver }}
-        cabal-version: ${{ matrix.cabal-ver }}
+        cabal-version: latest
         cabal-update:  true
 
     - name: Configure the build plan

diff --git a/src/github/workflows/stack-dry-run.yml b/src/github/workflows/stack-dry-run.yml
@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-24.04]
         stack-ver: ['latest']
         # Note: when adding a version here, check that it is not excluded in the triggers above.
         ghc-ver: [9.6.5, 9.4.8, 9.2.8, 9.0.2, 8.10.7, 8.8.4]

diff --git a/src/github/workflows/stack.yml b/src/github/workflows/stack.yml
@@ -52,7 +52,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04,macos-12]
+        os: [ubuntu-24.04,macos-14]
         ghc-ver: [9.8.2]
           # !!! MAKE SURE THIS GHC VERSION IS IN SYNC WITH trigger_path_list !!!
           #

diff --git a/src/github/workflows/test.yml b/src/github/workflows/test.yml
@@ -52,9 +52,6 @@ env:
   # Part 1: Versions (need update)
   ###########################################################################
 
-  # Andreas, 2022-11-24, set the stack version here so that it is easily
-  # shared between the jobs.
-  STACK_VER: "2.13.1"
   # Andreas, 2022-03-26, 2022-11-28:
   # GHC_VER should be given as x.y.z (as opposed to x.y only)
   # because it is used verbatim when referring to stack-x.y.z.yaml.
@@ -87,7 +84,7 @@ jobs:
       && !contains(github.event.head_commit.message, '[github skip]')
       && !contains(github.event.head_commit.message, '[skip github]')
 
-    runs-on: &runs_on ubuntu-22.04
+    runs-on: &runs_on ubuntu-24.04
     steps:
     - name: Info about the context
       run: |
@@ -114,7 +111,7 @@ jobs:
       id: setup-haskell
       with:
         ghc-version: ${{ env.GHC_VER }}
-        stack-version: ${{ env.STACK_VER }}
+        stack-version: latest
         enable-stack: true
 
     # The Makefile tests whether stack.yaml is present to decide on stack vs. cabal build.

diff --git a/src/github/workflows/user_manual.yml b/src/github/workflows/user_manual.yml
@@ -20,13 +20,18 @@ jobs:
       && !contains(github.event.head_commit.message, '[github skip]')
       && !contains(github.event.head_commit.message, '[skip github]')
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
-      python-version: '3.11'
+      python-version: '3.12'
     steps:
 
     - uses: actions/checkout@v4
 
+    - name: Install imagemagick (convert)
+      run: |
+        sudo apt-get update
+        sudo apt-get install imagemagick
+
     - name: Set up Python ${{ env.python-version }}
       uses: actions/setup-python@v5
       with:

diff --git a/src/github/workflows/whitespace.yml b/src/github/workflows/whitespace.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   check:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout agda sources

diff --git a/stack-9.6.5.yaml b/stack-9.6.5.yaml
@@ -1,4 +1,4 @@
-resolver: lts-22.17
+resolver: lts-22.22
 compiler: ghc-9.6.5
 compiler-check: match-exact
 

diff --git a/stack-9.8.2.yaml b/stack-9.8.2.yaml
@@ -1,4 +1,4 @@
-resolver: nightly-2024-04-20
+resolver: nightly-2024-05-14
 compiler: ghc-9.8.2
 compiler-check: match-exact