From 65e28b890ff04547e5c4a035d68a907086ef064f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kirill=20M=C3=BCller?= <kirill@cynkra.com>
Date: Fri, 22 Nov 2024 20:46:58 +0100
Subject: [PATCH 1/2] ci: Use Ubuntu 24.04 and styler PR

---
 .github/workflows/R-CMD-check-status.yaml | 2 +-
 .github/workflows/R-CMD-check.yaml        | 6 +++---
 .github/workflows/lock.yaml               | 2 +-
 .github/workflows/pkgdown.yaml            | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/R-CMD-check-status.yaml b/.github/workflows/R-CMD-check-status.yaml
index b9bdf4e4a..7a4ea62f0 100644
--- a/.github/workflows/R-CMD-check-status.yaml
+++ b/.github/workflows/R-CMD-check-status.yaml
@@ -12,7 +12,7 @@ name: rcc-status
 
 jobs:
   rcc-status:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     name: "Update commit status"
 
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
index 2af0024c6..59ba68010 100644
--- a/.github/workflows/R-CMD-check.yaml
+++ b/.github/workflows/R-CMD-check.yaml
@@ -43,7 +43,7 @@ name: rcc
 
 jobs:
   rcc-smoke:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       sha: ${{ steps.commit.outputs.sha }}
       versions-matrix: ${{ steps.versions-matrix.outputs.matrix }}
@@ -106,7 +106,7 @@ jobs:
           cache-version: rcc-smoke-2
           needs: check, website
           # Beware of using dev pkgdown here, has brought in dev dependencies in the past
-          extra-packages: any::rcmdcheck r-lib/roxygen2 any::decor r-lib/styler r-lib/pkgdown deps::.
+          extra-packages: any::rcmdcheck r-lib/roxygen2 any::decor r-lib/styler#1235 r-lib/pkgdown deps::.
 
       - name: Install package
         run: |
@@ -205,7 +205,7 @@ jobs:
         shell: bash
 
   rcc-smoke-check-matrix:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     name: "Check matrix"
 
diff --git a/.github/workflows/lock.yaml b/.github/workflows/lock.yaml
index e2a367f84..dd05bc31f 100644
--- a/.github/workflows/lock.yaml
+++ b/.github/workflows/lock.yaml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   lock:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: dessant/lock-threads@v5
         with:
diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml
index de69b1494..b3fb69ad8 100644
--- a/.github/workflows/pkgdown.yaml
+++ b/.github/workflows/pkgdown.yaml
@@ -16,7 +16,7 @@ concurrency:
 
 jobs:
   pkgdown:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     name: "pkgdown"
 

From e8e9c2163b55ed8d9f1e9b3f0b5c2b3ba5ab486f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kirill=20M=C3=BCller?= <kirill@cynkra.com>
Date: Fri, 22 Nov 2024 20:47:11 +0100
Subject: [PATCH 2/2] ci: Use Ubuntu 24.04 for fledge, squash

---
 .github/workflows/fledge.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/fledge.yaml b/.github/workflows/fledge.yaml
index b197fb35a..23cffe5fa 100644
--- a/.github/workflows/fledge.yaml
+++ b/.github/workflows/fledge.yaml
@@ -19,7 +19,7 @@ concurrency:
 
 jobs:
   check_fork:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       is_forked: ${{ steps.check.outputs.is_forked }}
     steps:
@@ -33,7 +33,7 @@ jobs:
         shell: bash
 
   fledge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: check_fork
     if: needs.check_fork.outputs.is_forked == 'false'
     permissions:
@@ -107,7 +107,7 @@ jobs:
           set -x
           gh pr create --base main --head fledge --fill-first
           gh workflow run rcc -f ref=$(git rev-parse HEAD)
-          gh pr merge --merge --auto
+          gh pr merge --squash --auto
         shell: bash
 
       - name: Check release