Skip to content

Commit

Permalink
Merge branch 'v2-branch' into fix/silent-pkg-config-unlink
Browse files Browse the repository at this point in the history
  • Loading branch information
gaborcsardi committed Feb 19, 2025
2 parents 0793f96 + 61d5d05 commit 99d1bf7
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 25 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/check-full.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ jobs:
- {os: ubuntu-latest, r: 'oldrel-3'}
- {os: ubuntu-latest, r: 'oldrel-4'}

- {os: ubuntu-22.04-arm, r: 'release' }


env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes
Expand All @@ -51,6 +54,8 @@ jobs:
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

- uses: gaborcsardi/quarto-actions/setup@fix/linux-arm64

- uses: ./setup-r-dependencies
with:
extra-packages: any::rcmdcheck
Expand Down
24 changes: 5 additions & 19 deletions .github/workflows/setup-pandoc-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@ jobs:
fail-fast: false
matrix:
config:
- { os: macos-14 }
- { os: macos-13 }
- { os: windows-latest }
- { os: ubuntu-latest }
- { os: macos-14 }
- { os: macos-13 }
- { os: windows-latest }
- { os: ubuntu-latest }
- { os: ubuntu-22.04-arm }

steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
Expand All @@ -45,18 +46,3 @@ jobs:

- run: where.exe pandoc
if: ${{ runner.os == 'Windows' }}

linux-arm64:
runs-on: [self-hosted, linux, ARM64]
name: arm64 Linux
container:
image: "ubuntu:22.04"

steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
- uses: ./setup-pandoc
with:
pandoc-version: ${{ github.event.inputs.version || '3.1.11' }}
token: ${{ secrets.GITHUB_TOKEN }}
- run: pandoc --version
- run: which pandoc
8 changes: 6 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Development version

* `[setup-r]` now installs gfortan 14.2 for R 4.5.0 and later (#965).
* `[setup-r]` now installs gfortran 14.2 for R 4.5.0 and later (#965).

* `[setup-r]` now does not use PPM on aarch64 Linux, because PPM
does not have binary packages for aarch64 Linux, and it would send
x86_64 binarires for aarch64 systems as well.

# `v2.11.1` (2024-11-25)

Expand All @@ -12,7 +16,7 @@
* `[setup-r-dependencies]` parameter `pak-version` can now be `repo` or
`none` as well. `repo` means that the action will install pak from
the configured repositories, using `install.packages()`. `repo` is
appropriate on systems that do not have access to our pak reporitory
appropriate on systems that do not have access to our pak repository
on GitHUb. `none` means that the action does not install pak at all.
Use this if you want to install pak yourself manually. Set the
`R_LIB_FOR_PAK` environment variable to point to the library where pak
Expand Down
6 changes: 6 additions & 0 deletions setup-r-dependencies/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ runs:
} else {
message("R_LIBS_USER GH env var is already set: ", Sys.getenv("R_LIBS_USER"))
}
dir.create(Sys.getenv("R_LIBS_SITE"), recursive = TRUE, showWarnings = FALSE)
dir.create(Sys.getenv("R_LIBS_USER"), recursive = TRUE, showWarnings = FALSE)
cat("::endgroup::\n")
shell: Rscript {0}

Expand Down Expand Up @@ -265,6 +267,10 @@ runs:
if (Sys.which("quarto") != "") {
cat("Quarto is already installed at", Sys.which("quarto"), "\n")
o <- "false"
} else if (Sys.info()[["machine"]] == "aarch64" && Sys.info()[["sysname"]] == "Linux") {
# do not install on aarch64 Linux, until this is merged and published:
# https://github.com/quarto-dev/quarto-actions/pull/122
o <- "false"
} else {
qmd <- dir(recursive = TRUE, pattern = "[.]qmd$")
if (length(qmd) > 0) {
Expand Down
6 changes: 3 additions & 3 deletions setup-r/dist/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion setup-r/src/installer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ async function setupRLibrary(version: IRVersion) {
if (IS_WINDOWS) {
rspm = `'https://packagemanager.posit.co/cran/${snapshot}'`;
}
if (IS_LINUX) {
if (IS_LINUX && ARCH == 'x86_64') {
let codename = "";
try {
await exec.exec("lsb_release", ["--short", "--codename"], {
Expand Down

0 comments on commit 99d1bf7

Please sign in to comment.