cleanup

Author: jeroen

.github/scripts/win-check.sh

@@ -6,11 +6,15 @@ 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
@@ -27,14 +31,8 @@ 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
-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
+curl -o tcltk.zip -L $tcltk
+unzip -q tcltk.zip
 
 # Add custom flags to MkRules.local
 #cp .github/scripts/MkRules.local src/gnuwin32/

.github/scripts/win-installer.sh

@@ -6,11 +6,15 @@ 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
@@ -27,15 +31,8 @@ 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
-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
+curl -o tcltk.zip -L $tcltk
+unzip -q tcltk.zip
 
 # Add custom flags to MkRules.local
 #cp .github/scripts/MkRules.local src/gnuwin32/

.github/workflows/build-svn.yaml

@@ -24,7 +24,9 @@ jobs:
         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
@@ -37,16 +39,9 @@ jobs:
         msystem: MSYS
         install: git make perl curl texinfo texinfo-tex rsync zip unzip diffutils
 
-    - 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'
+    - name: "Download rtools45 toolchain"
       run: |
-        url="https://github.com/r-windows/rtools-chocolatey/releases/download/6536/rtools45-toolchain-libs-base-6536.tar.zst"
+        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/ || true
 
     - name: Set timezone
@@ -80,6 +75,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'