Add Windows-arm64 to the matrix

Author: jeroen

.github/scripts/win-check.sh

@@ -4,14 +4,23 @@ set -e
 set -x
 
 # Put pdflatex on the path (needed only for CMD check)
+if [ "$( uname -s | grep ARM)" ]; then
+export PATH="/c/aarch64-w64-mingw32.static.posix/bin:$PATH:/c/Users/$USER/AppData/Roaming/TinyTeX/bin/windows:$HOME/AppData/Local/Programs/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX 2.9/miktex/bin/x64"
+tcltk="https://github.com/r-windows/rtools-chocolatey/releases/download/6536/tcltk-aarch64-6536-6492.zip"
+echo "USE_LLVM = 1" >> src/gnuwin32/MkRules.local
+clang --version
+else
 export PATH="/c/x86_64-w64-mingw32.static.posix/bin:$PATH:/c/Users/$USER/AppData/Roaming/TinyTeX/bin/windows:$HOME/AppData/Local/Programs/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX 2.9/miktex/bin/x64"
+tcltk="https://github.com/r-windows/rtools-chocolatey/releases/download/6536/tcltk-6536-6492.zip"
+gcc --version
+fi
+
 echo "PATH: $PATH"
 pdflatex --version
 texindex --version
 texi2any --version
 make --version
 perl --version
-gcc --version
 
 # Extra steps to prepare SVN build (rather than official tarball)
 cd "$(cygpath ${GITHUB_WORKSPACE})"
@@ -22,11 +31,11 @@ curl -sSL https://curl.se/ca/cacert.pem > etc/curl-ca-bundle.crt
 ./.github/scripts/svn-info.sh
 
 # Download the TCL bundle required by tcltk package
-curl -OL https://github.com/r-windows/rtools-chocolatey/releases/download/6104/tcltk-6104-6025.zip
-unzip tcltk-6104-6025.zip
+curl -o tcltk.zip -L $tcltk
+unzip -q tcltk.zip
 
 # Add custom flags to MkRules.local
-cp .github/scripts/MkRules.local src/gnuwin32/
+#cp .github/scripts/MkRules.local src/gnuwin32/
 cd src/gnuwin32
 
 # Build just the core pieces (no installer)

.github/scripts/win-installer.sh

@@ -4,14 +4,23 @@ set -e
 set -x
 
 # Put pdflatex on the path (needed only for CMD check)
+if [ "$( uname -s | grep ARM)" ]; then
+export PATH="/c/aarch64-w64-mingw32.static.posix/bin:$PATH:/c/Users/$USER/AppData/Roaming/TinyTeX/bin/windows:$HOME/AppData/Local/Programs/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX 2.9/miktex/bin/x64"
+tcltk="https://github.com/r-windows/rtools-chocolatey/releases/download/6536/tcltk-aarch64-6536-6492.zip"
+echo "USE_LLVM = 1" >> src/gnuwin32/MkRules.local
+clang --version
+else
 export PATH="/c/x86_64-w64-mingw32.static.posix/bin:$PATH:/c/Users/$USER/AppData/Roaming/TinyTeX/bin/windows:$HOME/AppData/Local/Programs/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX 2.9/miktex/bin/x64"
+tcltk="https://github.com/r-windows/rtools-chocolatey/releases/download/6536/tcltk-6536-6492.zip"
+gcc --version
+fi
+
 echo "PATH: $PATH"
 pdflatex --version
 texindex --version
 texi2any --version
 make --version
 perl --version
-gcc --version
 
 # Extra steps to prepare SVN build (rather than official tarball)
 cd "$(cygpath ${GITHUB_WORKSPACE})"
@@ -22,12 +31,11 @@ curl -sSL https://curl.se/ca/cacert.pem > etc/curl-ca-bundle.crt
 ./.github/scripts/svn-info.sh
 
 # Download the TCL bundle required by tcltk package
-#curl -OL https://cran.r-project.org/bin/windows/Rtools/rtools43/files/tcltk-5493-5412.zip
-curl -OL https://github.com/r-windows/rtools-chocolatey/releases/download/5948/Tcl-5948-5877.zip
-unzip Tcl-5948-5877.zip
+curl -o tcltk.zip -L $tcltk
+unzip -q tcltk.zip
 
 # Add custom flags to MkRules.local
-cp .github/scripts/MkRules.local src/gnuwin32/
+#cp .github/scripts/MkRules.local src/gnuwin32/
 cd src/gnuwin32
 
 # Build just the installer

.github/workflows/build-svn.yaml

@@ -140,7 +140,7 @@ jobs:
 
   windows:
     name: Windows
-    runs-on: windows-latest
+    runs-on: ${{matrix.OS}}
     timeout-minutes: 120
     env:
       R_CRAN_WEB: "https://cran.rstudio.com"
@@ -152,10 +152,12 @@ jobs:
       fail-fast: false
       matrix:
         script: [ 'check', 'installer' ]
+        OS: [ 'windows-latest', 'windows-11-arm']
     steps:
-
     - name: Prepare git
-      run: git config --global core.autocrlf false
+      run: |
+        git config --global core.autocrlf false
+        echo "archfix=${{ matrix.OS == 'windows-11-arm' && '-aarch64' || '' }}" >> $GITHUB_ENV
       shell: bash
 
     - name: Checkout
@@ -168,12 +170,10 @@ jobs:
         msystem: MSYS
         install: git make perl curl texinfo texinfo-tex rsync zip unzip diffutils
 
-    - name: "Download rtools44 toolchain"
+    - name: "Download rtools45 toolchain"
       run: |
-        url="https://github.com/r-windows/rtools-chocolatey/releases/download/6104/rtools44-toolchain-libs-base-6104.tar.zst"
-        curl -sSL $url | tar x --zstd -C /c/ || true
-        #echo "RTOOLS44_HOME=c:" >> $GITHUB_ENV
-        #echo "R_CUSTOM_TOOLS_SOFT=c:/x86_64-w64-mingw32.static.posix" >> $GITHUB_ENV
+        url="https://github.com/r-windows/rtools-chocolatey/releases/download/6536/rtools45-toolchain-libs-base${archfix}-6536.tar.zst"
+        curl -sSL $url | tar x --zstd -C /c/
 
     - name: Set timezone
       shell: powershell
@@ -206,6 +206,6 @@ jobs:
 
     - uses: actions/upload-artifact@v4
       with:
-        name: installer
+        name: installer${{env.archfix}}
         path: src/gnuwin32/installer/R-devel-win.exe
       if: matrix.script == 'installer'