ci: Use stable pak (#17)

* ci: Use stable pak * ci: Correctly detect branch protection * ci: Use Ubuntu 24.04 and styler PR * ci: Use Ubuntu 24.04 for fledge, squash * ci: Fix macOS (#16) * ci: Need to install R on Ubuntu 24.04 * ci: Need to install R on Ubuntu 24.04 for fledge * ci: Use styler from main branch * ci: Explicit permissions * ci: Ignore errors when removing pkg-config on macOS * ci: Use larger retry count for lock-threads workflow
igraph · Dec 6, 2024 · 97304e0 · 97304e0
1 parent 35edb0b
commit 97304e0
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 25 deletions.
diff --git a/.github/workflows/R-CMD-check-dev.yaml b/.github/workflows/R-CMD-check-dev.yaml
@@ -27,8 +27,6 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - uses: r-lib/actions/setup-r@v2
-        with:
-          install-r: false
 
       - id: set-matrix
         uses: ./.github/workflows/dep-matrix
@@ -70,7 +68,6 @@ jobs:
 
       - uses: ./.github/workflows/install
         with:
-          install-r: false
           cache-version: rcc-dev-base-1
           needs: check
           extra-packages: "any::rcmdcheck any::remotes ."
@@ -118,7 +115,6 @@ jobs:
 
       - uses: ./.github/workflows/install
         with:
-          install-r: false
           cache-version: rcc-dev-${{ matrix.package }}-1
           needs: check
           extra-packages: "any::rcmdcheck any::remotes ."

diff --git 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
@@ -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 }}
@@ -205,7 +205,7 @@ jobs:
         shell: bash
 
   rcc-smoke-check-matrix:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     name: "Check matrix"
 
@@ -294,7 +294,6 @@ jobs:
 
       - uses: ./.github/workflows/install
         with:
-          install-r: false
           cache-version: rcc-dev-${{ matrix.package }}-1
           needs: check
           extra-packages: "any::rcmdcheck any::remotes ."

diff --git 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:
@@ -61,7 +61,6 @@ jobs:
 
       - uses: r-lib/actions/setup-r@v2
         with:
-          install-r: false
           use-public-rspm: true
 
       - uses: r-lib/actions/setup-r-dependencies@v2
@@ -72,8 +71,18 @@ jobs:
           packages: cynkra/fledge
           cache-version: fledge-1
 
+      - name: Count rulesets
+        # Assume that branch is protected if ruleset exists
+        id: rulesets
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          n_rulesets=$(gh api repos/${{ github.repository }}/rulesets -q length)
+          echo "count=${n_rulesets}" >> $GITHUB_OUTPUT
+        shell: bash
+
       - name: Switch to branch if branch protection is enabled
-        if: github.ref_protected == 'true' || inputs.pr == 'true'
+        if: github.ref_protected == 'true' || inputs.pr == 'true' || steps.rulesets.outputs.count > 0
         run: |
           git checkout -b fledge
           git push -f -u origin HEAD
@@ -83,21 +92,21 @@ jobs:
         env:
           GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          check_default_branch <- ("${{ github.ref_protected == 'true' || inputs.pr == 'true' }}" != "true")
+          check_default_branch <- ("${{ github.ref_protected == 'true' || inputs.pr == 'true' || steps.rulesets.outputs.count > 0 }}" != "true")
           if (fledge::bump_version(which = "dev", no_change_behavior = "noop", check_default_branch = check_default_branch)) {
             fledge::finalize_version(push = TRUE)
           }
         shell: Rscript {0}
 
       - name: Create and merge PR if branch protection is enabled
-        if: github.ref_protected == 'true' || inputs.pr == 'true'
+        if: github.ref_protected == 'true' || inputs.pr == 'true' || steps.rulesets.outputs.count > 0
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           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
@@ -75,6 +75,12 @@ runs:
         echo "_R_CHECK_CRAN_INCOMING_USE_ASPELL_=true" | tee -a $GITHUB_ENV
       shell: bash
 
+    - name: Remove [email protected]
+      if: runner.os == 'macOS'
+      run: |
+        brew uninstall [email protected] || true
+      shell: bash
+
     - uses: r-lib/actions/setup-pandoc@v2
 
     - uses: r-lib/actions/setup-r@v2
@@ -95,7 +101,7 @@ runs:
       env:
         GITHUB_PAT: ${{ inputs.token }}
       with:
-        pak-version: devel
+        pak-version: stable
         needs: ${{ inputs.needs }}
         packages: ${{ inputs.packages }}
         extra-packages: ${{ inputs.extra-packages }} ${{ ( matrix.config.covr && 'any::covr' ) || '' }} ${{ steps.get-extra.outputs.packages }}

diff --git a/.github/workflows/lock.yaml b/.github/workflows/lock.yaml
@@ -1,14 +1,18 @@
 name: "Lock threads"
-
+permissions:
+  issues: write
+  pull-requests: write
+  discussions: write
 on:
+  workflow_dispatch:
   schedule:
     - cron: "37 2 * * *"
 
 jobs:
   lock:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: dessant/lock-threads@v5
+      - uses: krlmlr/lock-threads@patch-1
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: "365"

diff --git 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"
 
@@ -39,7 +39,6 @@ jobs:
       - uses: ./.github/workflows/install
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          install-r: false
           cache-version: pkgdown-2
           needs: website
           extra-packages: r-lib/pkgdown local::.

diff --git a/.github/workflows/pr-commands.yaml b/.github/workflows/pr-commands.yaml
@@ -16,8 +16,6 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: r-lib/actions/setup-r@v2
-        with:
-          install-r: false
       - name: Configure Git identity
         run: |
           env | sort
@@ -55,8 +53,6 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: r-lib/actions/setup-r@v2
-        with:
-          install-r: false
       - name: Configure Git identity
         run: |
           env | sort