From ff368fb8847ee4ccfc94c545563ef3be1d161e28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kirill=20M=C3=BCller?= <krlmlr@users.noreply.github.com>
Date: Sun, 24 Nov 2024 19:34:16 +0100
Subject: [PATCH] ci: Use Ubuntu 24.04 and styler PR (#2248)

* ci: Use Ubuntu 24.04 and styler PR

* ci: Use Ubuntu 24.04 for fledge, squash

* ci: Fix macOS (#16)

* R >= 4.0.0
---
 .github/workflows/R-CMD-check-status.yaml     |  2 +-
 .github/workflows/R-CMD-check.yaml            |  6 +++---
 .../custom/before-install/action.yml          | 20 -------------------
 .github/workflows/fledge.yaml                 |  6 +++---
 .github/workflows/install/action.yml          |  6 ++++++
 .github/workflows/lock.yaml                   |  2 +-
 .github/workflows/pkgdown.yaml                |  2 +-
 7 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/R-CMD-check-status.yaml b/.github/workflows/R-CMD-check-status.yaml
index b9bdf4e4a0..7a4ea62f05 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 7b489e0c50..ebb19df746 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/custom/before-install/action.yml b/.github/workflows/custom/before-install/action.yml
index d07a8f6b5c..fca0f02a23 100644
--- a/.github/workflows/custom/before-install/action.yml
+++ b/.github/workflows/custom/before-install/action.yml
@@ -3,31 +3,11 @@ name: 'Custom steps to run before R packages are installed'
 runs:
   using: "composite"
   steps:
-    - name: Define R CMD check error condition
-      # Rscript not available on Mac
-      if: runner.os != 'macOS'
-      run: |
-        if (getRversion() < "4.0") {
-          message("Setting RCMDCHECK_ERROR_ON")
-          cat('RCMDCHECK_ERROR_ON="warning"\n', file = Sys.getenv("GITHUB_ENV"), append = TRUE)
-        }
-      shell: Rscript {0}
-
     - name: Define _R_CHECK_PKG_SIZES_THRESHOLD_
       run: |
         echo '_R_CHECK_PKG_SIZES_THRESHOLD_=10' | tee -a $GITHUB_ENV
       shell: bash
 
-    - name: Define _R_CHECK_FORCE_SUGGESTS_
-      # Rscript not available on Mac
-      if: runner.os != 'macOS'
-      run: |
-        if (getRversion() < "4.0") {
-          message("Setting _R_CHECK_FORCE_SUGGESTS_")
-          cat('_R_CHECK_FORCE_SUGGESTS_=false\n', file = Sys.getenv("GITHUB_ENV"), append = TRUE)
-        }
-      shell: Rscript {0}
-
     - name: Define DM_TEST_SRC
       run: |
         echo "DM_TEST_SRC=${{ matrix.config.test-src }}" | tee -a $GITHUB_ENV
diff --git a/.github/workflows/fledge.yaml b/.github/workflows/fledge.yaml
index b197fb35aa..23cffe5fae 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
diff --git a/.github/workflows/install/action.yml b/.github/workflows/install/action.yml
index bb42f18615..59673d9cac 100644
--- a/.github/workflows/install/action.yml
+++ b/.github/workflows/install/action.yml
@@ -75,6 +75,12 @@ runs:
         echo "_R_CHECK_CRAN_INCOMING_USE_ASPELL_=true" | tee -a $GITHUB_ENV
       shell: bash
 
+    - name: Remove pkg-config@0.29.2
+      if: runner.os == 'macOS'
+      run: |
+        brew uninstall pkg-config@0.29.2
+      shell: bash
+
     - uses: r-lib/actions/setup-pandoc@v2
 
     - uses: r-lib/actions/setup-r@v2
diff --git a/.github/workflows/lock.yaml b/.github/workflows/lock.yaml
index e2a367f848..dd05bc31f3 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 de69b1494a..b3fb69ad8a 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"