Skip to content

Commit f715747

Browse files
committed
ci: Use Ubuntu 24.04 and styler PR (#605)
* ci: Use Ubuntu 24.04 and styler PR * ci: Use Ubuntu 24.04 for fledge, squash
1 parent 5f462ac commit f715747

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

.github/workflows/R-CMD-check-status.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ name: rcc-status
1212

1313
jobs:
1414
rcc-status:
15-
runs-on: ubuntu-latest
15+
runs-on: ubuntu-24.04
1616

1717
name: "Update commit status"
1818

.github/workflows/R-CMD-check.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ name: rcc
4343

4444
jobs:
4545
rcc-smoke:
46-
runs-on: ubuntu-latest
46+
runs-on: ubuntu-24.04
4747
outputs:
4848
sha: ${{ steps.commit.outputs.sha }}
4949
versions-matrix: ${{ steps.versions-matrix.outputs.matrix }}
@@ -106,7 +106,7 @@ jobs:
106106
cache-version: rcc-smoke-2
107107
needs: check, website
108108
# Beware of using dev pkgdown here, has brought in dev dependencies in the past
109-
extra-packages: any::rcmdcheck r-lib/roxygen2 any::decor r-lib/styler r-lib/pkgdown deps::.
109+
extra-packages: any::rcmdcheck r-lib/roxygen2 any::decor r-lib/styler#1235 r-lib/pkgdown deps::.
110110

111111
- name: Install package
112112
run: |
@@ -205,7 +205,7 @@ jobs:
205205
shell: bash
206206

207207
rcc-smoke-check-matrix:
208-
runs-on: ubuntu-latest
208+
runs-on: ubuntu-24.04
209209

210210
name: "Check matrix"
211211

.github/workflows/fledge.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ concurrency:
1919

2020
jobs:
2121
check_fork:
22-
runs-on: ubuntu-latest
22+
runs-on: ubuntu-24.04
2323
outputs:
2424
is_forked: ${{ steps.check.outputs.is_forked }}
2525
steps:
@@ -33,7 +33,7 @@ jobs:
3333
shell: bash
3434

3535
fledge:
36-
runs-on: ubuntu-latest
36+
runs-on: ubuntu-24.04
3737
needs: check_fork
3838
if: needs.check_fork.outputs.is_forked == 'false'
3939
permissions:
@@ -107,7 +107,7 @@ jobs:
107107
set -x
108108
gh pr create --base main --head fledge --fill-first
109109
gh workflow run rcc -f ref=$(git rev-parse HEAD)
110-
gh pr merge --merge --auto
110+
gh pr merge --squash --auto
111111
shell: bash
112112

113113
- name: Check release

.github/workflows/lock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
lock:
9-
runs-on: ubuntu-latest
9+
runs-on: ubuntu-24.04
1010
steps:
1111
- uses: dessant/lock-threads@v5
1212
with:

.github/workflows/pkgdown.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ concurrency:
1616

1717
jobs:
1818
pkgdown:
19-
runs-on: ubuntu-latest
19+
runs-on: ubuntu-24.04
2020

2121
name: "pkgdown"
2222

0 commit comments

Comments
 (0)