Skip to content

Commit 5cd7479

Browse files
committed
Prioritize new quarto
1 parent b136210 commit 5cd7479

File tree

1 file changed

+19
-14
lines changed

1 file changed

+19
-14
lines changed

.github/workflows/custom-pages.yml

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,30 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v4
1414

15-
- uses: r-lib/actions/setup-r@v2 # freeze R
16-
with: { r-version: "4.4.2" }
15+
- uses: r-lib/actions/setup-r@v2
16+
with:
17+
r-version: '4.4.2'
1718

18-
- uses: r-lib/actions/setup-pandoc@v2 # Quarto needs Pandoc
19+
- uses: r-lib/actions/setup-pandoc@v2
1920

2021
- uses: quarto-dev/quarto-actions/setup@v2
2122
with:
2223
version: '1.6.43'
2324

24-
- name: Uninstall any pip-installed Quarto
25-
run: pip uninstall -y quarto-cli || true
26-
27-
- name: Force system Quarto in PATH
28-
run: echo "PATH=/usr/bin:$PATH" >> $GITHUB_ENV
29-
30-
# speed: reuse compiled packages
25+
# ──────────────────────────────────────────────────────────────────────
26+
# Prepend /usr/bin so the .deb version of Quarto wins over any shims
27+
- name: Prioritize APT-installed Quarto
28+
run: echo "PATH=/usr/bin:${PATH}" >> $GITHUB_ENV
29+
30+
# Debug: confirm the right binary is being used
31+
- name: Check Quarto version
32+
run: |
33+
echo "Which quarto:"
34+
which -a quarto
35+
echo "Version:"
36+
quarto --version
37+
38+
# ──────────────────────────────────────────────────────────────────────
3139
- name: Cache renv packages
3240
uses: actions/cache@v4
3341
with:
@@ -37,18 +45,15 @@ jobs:
3745
key: ${{ runner.os }}-renv-${{ hashFiles('renv.lock') }}
3846
restore-keys: ${{ runner.os }}-renv-
3947

40-
# restore packages exactly as in renv.lock
4148
- name: Restore R packages
4249
run: Rscript -e 'renv::restore(prompt = FALSE)'
4350

44-
# build the site
4551
- name: Render site
4652
run: quarto render
4753

48-
- name: List rendered files # optional debug
54+
- name: List rendered files
4955
run: ls -la docs
5056

51-
# deploy
5257
- name: Deploy
5358
uses: peaceiris/actions-gh-pages@v3
5459
with:

0 commit comments

Comments
 (0)