Test arm

jeroen · jeroen · commit 9e91d03a6819 · 2025-04-16T12:51:42.000+02:00
diff --git a/.github/scripts/win-check.sh b/.github/scripts/win-check.sh
@@ -4,14 +4,19 @@ 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"
+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"
+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 +27,17 @@ 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
+if [ "$( uname -s | grep ARM)" ]; then
+echo "USE_LLVM = 1" >> src/gnuwin32/MkRules.local
+curl -OL https://github.com/r-windows/rtools-chocolatey/releases/download/6536/tcltk-aarch64-6536-6492.zip
+unzip tcltk-aarch64-6536-6492.zip
+else
+curl -OL https://github.com/r-windows/rtools-chocolatey/releases/download/6536/tcltk-6536-6492.zip
+unzip tcltk-6536-6492.zip
+fi
 
 # 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)
diff --git a/.github/scripts/win-installer.sh b/.github/scripts/win-installer.sh
@@ -4,14 +4,19 @@ 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"
+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"
+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})"
@@ -23,11 +28,17 @@ curl -sSL https://curl.se/ca/cacert.pem > etc/curl-ca-bundle.crt
 
 # 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
+if [ "$( uname -s | grep ARM)" ]; then
+echo "USE_LLVM = 1" >> src/gnuwin32/MkRules.local
+curl -OL https://github.com/r-windows/rtools-chocolatey/releases/download/6536/tcltk-aarch64-6536-6492.zip
+unzip tcltk-aarch64-6536-6492.zip
+else
+curl -OL https://github.com/r-windows/rtools-chocolatey/releases/download/6536/tcltk-6536-6492.zip
+unzip tcltk-6536-6492.zip
+fi
 
 # 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
diff --git a/.github/workflows/build-svn.yaml b/.github/workflows/build-svn.yaml
@@ -7,140 +7,9 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  linux:
-    name: Linux
-    runs-on: ubuntu-24.04${{matrix.ARCH == 'arm' && '-arm' || ''}}
-    container:
-      image: ${{matrix.OS}}
-    env:
-      DEBIAN_FRONTEND: noninteractive
-      R_CRAN_WEB: "https://cran.rstudio.com"
-      CRAN_RSYNC: 'mirrors.nic.cz::CRAN'
-    strategy:
-      fail-fast: false
-      matrix:
-        CC: [ gcc, clang ]
-        OS: [ 'debian:stable', 'debian:testing' ]
-        ARCH: [ 'intel', 'arm']
-    steps:
-    - name: System dependencies
-      run: |
-        set -e
-        apt-get update -y
-        apt-get install -y ${{matrix.CC}} wget locales git rsync gfortran xvfb autoconf pkg-config texinfo texlive-latex-extra texlive-fonts-recommended tk8.6-dev \
-        libcurl4-openssl-dev libblas-dev libbz2-dev libicu-dev libjpeg-dev liblapack-dev liblzma-dev libncurses5-dev libpcre2-dev libpng-dev libtiff-dev libcairo2-dev libpango1.0-dev libreadline-dev libxt-dev
-        localedef -i en_US -f UTF-8 en_US.UTF-8
-        echo "LANG=en_US.UTF-8" >> $GITHUB_ENV
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 100
-
-    - name: Prepare
-      run: |
-        git config --global --add safe.directory $PWD || true
-        sed -i.bak 's|$(GIT) svn info|./.github/scripts/svn-info.sh|' Makefile.in
-        ./.github/scripts/wget-recommended.sh
-        ./.github/scripts/svn-info.sh
-    - name: Configure
-      run: CC=${{matrix.CC}} ./configure --enable-R-shlib --with-blas --with-lapack --disable-java
-
-    - name: Build
-      run: make
-
-    - name: Check
-      run: xvfb-run make check-all
-
-    - name: Print failed tests
-      if: always()
-      run: tail -n100 tests/*.fail || true
-
-  macos:
-    name: MacOS
-    strategy:
-      fail-fast: false
-      matrix:
-        OS: [ 'macOS-13', 'macOS-14' ]
-    runs-on: ${{matrix.OS}}
-    timeout-minutes: 90
-    env:
-      PKG_CONFIG_PATH: /opt/X11/lib/pkgconfig
-      R_CRAN_WEB: "https://cran.rstudio.com"
-      CRAN_RSYNC: 'mirrors.nic.cz::CRAN'
-      R_TEXI2DVICMD: emulation
-
-    steps:
-    - name: Download CRAN system libraries
-      run: |
-        echo "ARCH=$(uname -m)" >> $GITHUB_ENV
-        curl --retry 3 -fsSL https://github.com/r-universe-org/cranlibs/releases/download/2025-01-05/cranlibs-everything.tar.xz -o libs.tar.xz
-        sudo tar -xf libs.tar.xz -C / opt
-        rm -f libs.tar.xz
-
-    - name: Remove homebrew
-      run: |
-        echo "/opt/R/${ARCH}/bin" >> $GITHUB_PATH
-        echo "LDFLAGS=-L/opt/R/${ARCH}/lib" >> $GITHUB_ENV
-        echo "CPPFLAGS=-I/opt/R/${ARCH}/include" >> $GITHUB_ENV
-        echo "PKG_CONFIG_PATH=/opt/R/${ARCH}/lib/pkgconfig:/opt/R/${ARCH}/share/pkgconfig" >> $GITHUB_ENV
-        echo "/Library/TeX/texbin" >> $GITHUB_PATH
-        echo "/usr/local/opt/texinfo/bin" >> $GITHUB_PATH
-        cp -fv $(which wget) "/opt/R/${ARCH}/bin"
-        brew unlink $(brew list --formula) || true
-
-    - name: Install CRAN fortran build
-      run: |
-        curl --retry 3 -fsSLO https://github.com/R-macos/gcc-12-branch/releases/download/12.2-darwin-r0.1/gfortran-12.2-universal.pkg
-        sudo installer -pkg "gfortran-12.2-universal.pkg" -target /
-        rm -f gfortran-12.2-universal.pkg
-        echo "/opt/gfortran/bin" >> $GITHUB_PATH
-        echo "FC=/opt/gfortran/bin/gfortran" >> $GITHUB_ENV
-
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 100
-
-    - name: Prepare
-      run: |
-        sed -i.bak 's|$(GIT) svn info|./.github/scripts/svn-info.sh|' Makefile.in
-        ./.github/scripts/wget-recommended.sh
-        ./.github/scripts/svn-info.sh
-
-    - name: Configure
-      run: CC=clang ./configure --prefix=/opt/R/${ARCH}/r-devel --disable-java --with-cairo --without-tcltk --without-x --with-aqua $ACCELERATE --enable-R-shlib SED=/usr/bin/sed
-      env:
-        PDFLATEX: ${{github.workspace}}/.github/scripts/dummy
-        ACCELERATE: ${{ matrix.OS != 'macOS-13' && '--with-lapack --with-blas' || '' }}
-
-    - name: Build
-      run: make
-      env:
-        PDFLATEX: ${{github.workspace}}/.github/scripts/dummy
-
-    - name: Install
-      run: |
-        mkdir -p /opt/R/${ARCH}/r-devel
-        make install DESTDIR="/opt/R/${ARCH}/r-devel"
-        (cd /opt/R/${ARCH}/r-devel; tar cfJ "/opt/R/r-devel-${ARCH}.tar.xz" .)
-
-    - uses: actions/upload-artifact@v4
-      with:
-        name: R-devel-${{ matrix.OS == 'macOS-13' && 'x86_64' || 'arm64' }}
-        path: /opt/R/r-devel-${{ matrix.OS == 'macOS-13' && 'x86_64' || 'arm64' }}.tar.xz
-
-    - name: Check
-      run: make check-all
-      env:
-        PDFLATEX: ${{github.workspace}}/.github/scripts/dummy
-
-    - name: Print failed tests
-      if: always()
-      run: tail -n100 tests/*.fail || true
-
   windows:
     name: Windows
-    runs-on: windows-latest
+    runs-on: ${{matrix.OS}}
     timeout-minutes: 120
     env:
       R_CRAN_WEB: "https://cran.rstudio.com"
@@ -152,8 +21,8 @@ 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
       shell: bash
@@ -168,12 +37,17 @@ jobs:
         msystem: MSYS
         install: git make perl curl texinfo texinfo-tex rsync zip unzip diffutils
 
-    - name: "Download rtools44 toolchain"
+    - name: "Download rtools45 ARM64 toolchain"
+      if: matrix.OS == 'windows-11-arm'
+      run: |
+        url="https://github.com/r-windows/rtools-chocolatey/releases/download/6536/rtools45-toolchain-libs-base-aarch64-6536.tar.zst"
+        curl -sSL $url | tar x --zstd -C /c/ || true
+
+    - name: "Download rtools45 Intel toolchain"
+      if: matrix.OS != 'windows-11-arm'
       run: |
-        url="https://github.com/r-windows/rtools-chocolatey/releases/download/6104/rtools44-toolchain-libs-base-6104.tar.zst"
+        url="https://github.com/r-windows/rtools-chocolatey/releases/download/6536/rtools45-toolchain-libs-base-6536.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
 
     - name: Set timezone
       shell: powershell
