Skip to content

Commit 69267d6

Browse files
andrjohnsandrjohns
committed
Update workflows
1 parent 8c2124c commit 69267d6

File tree

2 files changed

+22
-61
lines changed

2 files changed

+22
-61
lines changed

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

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,17 @@ jobs:
88
R-CMD-check:
99
runs-on: ubuntu-latest
1010

11-
name: Check (${{ matrix.config.platform }} ${{ matrix.config.cc }})
11+
name: Check (${{ matrix.config.platform }})
1212

1313
strategy:
1414
fail-fast: false
1515
matrix:
1616
config:
17-
- { platform: 386, cc: gcc-14, cxx: g++-14 }
18-
- { platform: 386, cc: clang-18, cxx: clang++-18 }
19-
20-
- { platform: armel, cc: gcc-14, cxx: g++-14 }
21-
- { platform: armel, cc: clang-18, cxx: clang++-18 }
22-
23-
- { platform: armhf, cc: gcc-14, cxx: g++-14 }
24-
- { platform: armhf, cc: clang-18, cxx: clang++-18 }
25-
26-
- { platform: FreeBSD, cc: default, cxx: default }
17+
- { platform: 386 }
18+
- { platform: armhf }
19+
- { platform: ppc64le }
20+
- { platform: s390x }
21+
- { platform: FreeBSD }
2722

2823
env:
2924
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
@@ -46,19 +41,12 @@ jobs:
4641
options: -v ${{ github.workspace }}:/quickjsr --platform=linux/${{ matrix.config.platform }} -e DEBIAN_FRONTEND=noninteractive -e TZ=Etc/UTC -e LANG=en_AU.UTF-8
4742
run: |
4843
apt-get update
49-
apt-get install --no-install-recommends -y ${{ matrix.config.cc }} g++-14 \
44+
apt-get install --no-install-recommends -y g++ \
5045
r-base-core locales pandoc qpdf r-cran-tinytest r-cran-rmarkdown \
5146
r-cran-knitr r-cran-rcmdcheck make
5247
echo "en_AU.UTF-8 UTF-8" >> /etc/locale.gen
5348
locale-gen en_AU.UTF-8
54-
echo "CC=${{ matrix.config.cc }}" >> /etc/R/Makeconf
55-
echo "CXX=${{ matrix.config.cxx }}" >> /etc/R/Makeconf
56-
# PPC64LE pandoc does not support lua filters (breaking vignettes)
57-
if [ "${{ matrix.config.platform }}" = "ppc64le" ]; then
58-
Rscript -e 'rcmdcheck::rcmdcheck("/quickjsr", args = c("--no-manual", "--as-cran", "--no-vignettes"), build_args = "--no-build-vignettes", check_dir = "/quickjsr/check")'
59-
else
60-
Rscript -e 'rcmdcheck::rcmdcheck("/quickjsr", args = c("--no-manual", "--as-cran"), check_dir = "/quickjsr/check")'
61-
fi
49+
Rscript -e 'rcmdcheck::rcmdcheck("/quickjsr", args = c("--no-manual", "--as-cran"), check_dir = "/quickjsr/check")'
6250
6351
- name: Test in FreeBSD
6452
if: matrix.config.platform == 'FreeBSD'
@@ -73,5 +61,5 @@ jobs:
7361
- name: Upload check results
7462
uses: actions/upload-artifact@v4
7563
with:
76-
name: arch-${{ matrix.config.platform }}-${{ matrix.config.cc }}-results
64+
name: arch-${{ matrix.config.platform }}-results
7765
path: check

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

Lines changed: 13 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,22 @@ name: R-CMD-check
1010

1111
jobs:
1212
R-CMD-check:
13-
runs-on: ${{ matrix.config.os }}
13+
runs-on: ${{ matrix.config.os == 'wasm' && 'ubuntu-latest' || matrix.config.os }}
14+
container: ${{ matrix.config.os == 'wasm' && 'ghcr.io/r-universe-org/build-wasm' || '' }}
1415

1516
name: ${{ matrix.config.os }} (${{ matrix.config.r }})
1617

1718
strategy:
1819
fail-fast: false
1920
matrix:
2021
config:
22+
- {os: wasm, r: 'release'}
23+
2124
- {os: macos-latest, r: 'devel'}
2225
- {os: macos-latest, r: 'release'}
2326
- {os: macos-latest, r: 'oldrel'}
2427

25-
- {os: windows-11-arm }
28+
- {os: windows-11-arm, r: 'devel'}
2629
- {os: windows-latest, r: 'devel'}
2730
- {os: windows-latest, r: 'release'}
2831
- {os: windows-latest, r: 'oldrel'}
@@ -48,55 +51,25 @@ jobs:
4851
- uses: r-lib/actions/setup-pandoc@v2
4952

5053
- uses: r-lib/actions/setup-r@v2
51-
if: matrix.config.os != 'windows-11-arm'
5254
with:
5355
r-version: ${{ matrix.config.r }}
5456
rtools-version: ${{ matrix.config.rtools }}
5557
http-user-agent: ${{ matrix.config.http-user-agent }}
5658
use-public-rspm: true
5759

58-
- name: Install R & RTools (ARM64)
59-
if: matrix.config.os == 'windows-11-arm'
60-
run: |
61-
$url = "https://www.r-project.org/nosvn/winutf8/aarch64/R-4-signed/R-4.5.0-aarch64.exe"
62-
Invoke-WebRequest `
63-
-Uri https://www.r-project.org/nosvn/winutf8/aarch64/R-4-signed/R-4.5.0-aarch64.exe `
64-
-OutFile R-4.5.0-aarch64.exe
65-
Start-Process `
66-
-FilePath R-4.5.0-aarch64.exe `
67-
-ArgumentList "/INSTALL /VERYSILENT /SUPPRESSMSGBOXES" -Wait
68-
69-
Invoke-WebRequest `
70-
-Uri https://github.com/r-hub/rtools45/releases/download/latest/rtools45-aarch64.exe `
71-
-OutFile "rtools45-aarch64.exe"
72-
Start-Process `
73-
-FilePath "rtools45-aarch64.exe" `
74-
-ArgumentList "/INSTALL /VERYSILENT /SUPPRESSMSGBOXES" -Wait
75-
76-
echo "C:/rtools45-aarch64/usr/bin;C:/rtools45-aarch64/aarch64-w64-mingw32.static.posix/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
77-
echo "C:\Program Files\R-aarch64\R-4.5.0\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
78-
Remove-Item -Path "R-4.5.0-aarch64.exe"
79-
Remove-Item -Path "rtools45-aarch64.exe"
80-
81-
- name: Install pak on Windows ARM
82-
if: matrix.config.os == 'windows-11-arm'
83-
run: |
84-
libsdir <- file.path(Sys.getenv("TMP"), "Library")
85-
dir.create(libsdir, recursive = TRUE, showWarnings = FALSE)
86-
cat(sprintf("R_LIB_FOR_PAK=%s\n", libsdir), file = Sys.getenv("GITHUB_ENV"), append = TRUE)
87-
cat(sprintf("R_LIBS_USER=%s\n", libsdir), file = Sys.getenv("GITHUB_ENV"), append = TRUE)
88-
install.packages("pak", lib = libsdir,
89-
repos = c("https://r-lib.r-universe.dev", "https://cloud.r-project.org"),
90-
Ncpus = 4);
91-
shell: Rscript {0}
92-
9360
- uses: r-lib/actions/setup-r-dependencies@v2
9461
with:
95-
extra-packages: any::rcmdcheck
62+
extra-packages: any::rcmdcheck ${{ matrix.config.os == 'wasm' && 'github::r-wasm/rwasm' || '' }}
9663
needs: check
97-
pak-version: ${{ matrix.config.os == 'windows-11-arm' && 'none' || 'stable' }}
9864

9965
- uses: r-lib/actions/check-r-package@v2
66+
if: matrix.config.os != 'wasm'
10067
with:
10168
upload-snapshots: true
10269
check-dir: '"check"'
70+
71+
- name: Check WASM build
72+
if: matrix.config.os == 'wasm'
73+
run: |
74+
rwasm::build("local::.")
75+
shell: Rscript {0}

0 commit comments

Comments
 (0)