Add DESTDIR for ubuntu package builds. Make windows builds use the same action in push and release mode.

Author: Kasper Peeters

.github/workflows/windows-installer.yml

@@ -16,29 +16,60 @@ defaults:
 
 jobs:
   msys2-ucrt64:
-    runs-on: windows-latest
+    strategy:
+      matrix:
+        include:
+          - os: windows-2022
+            name: x86_64
+            display-name: "Windows 11 x86_64"
+            msystem: ucrt64
+            midfix: ucrt-x86_64
+          - os: windows-11-arm
+            name: arm64
+            msystem: clangarm64
+            midfix: clang-aarch64
+            display-name: "Windows 11 arm64"
+    runs-on: ${{ matrix.os }}
     name: Windows 11
     defaults:
       run:
         shell: msys2 {0}
 
     steps:
+    - name: Install WiX v4/v5 Tool
+      run: |
+        dotnet tool install --tool-path c:\WiX\bin wix --version 5.0.2
+        c:\WiX\bin\wix extension add --global WixToolset.UI.wixext/5.0.2
+      shell: pwsh
+
+    - name: Add WiX toolkit to PATH
+      shell: bash
+      run: |
+        echo "WiX installed at ${WIX}, hopefully..."
+        echo "Listing C:/WiX/bin"
+        ls "C:/WiX/bin"
+        echo "Listing Program Files (x86):"
+        ls "C:/Program Files (x86)/"
+        echo "Listing Program Files:"        
+        ls "C:/Program Files/"
+        echo "${WIX}bin" >> $GITHUB_PATH
+
     - uses: msys2/setup-msys2@v2
       with:
-        msystem: UCRT64
+        msystem: ${{ matrix.msystem }}
         update: true
         install: >-
           curl
           git
-          mingw-w64-ucrt-x86_64-gcc
-          mingw-w64-ucrt-x86_64-python
-          mingw-w64-ucrt-x86_64-gtkmm3
-          mingw-w64-ucrt-x86_64-boost    
-          mingw-w64-ucrt-x86_64-sqlite3
-          mingw-w64-ucrt-x86_64-cmake
-          mingw-w64-ucrt-x86_64-python-matplotlib
-          mingw-w64-ucrt-x86_64-python-sympy
-          mingw-w64-ucrt-x86_64-github-cli
+          mingw-w64-${{ matrix.midfix }}-gcc
+          mingw-w64-${{ matrix.midfix }}-python
+          mingw-w64-${{ matrix.midfix }}-gtkmm3
+          mingw-w64-${{ matrix.midfix }}-boost    
+          mingw-w64-${{ matrix.midfix }}-sqlite3
+          mingw-w64-${{ matrix.midfix }}-cmake
+          mingw-w64-${{ matrix.midfix }}-python-matplotlib
+          mingw-w64-${{ matrix.midfix }}-python-sympy
+          mingw-w64-${{ matrix.midfix }}-github-cli
           
     - name: Authenticate GitHub CLI
       run: gh auth setup-git

.github/workflows/windows.yml

@@ -1,8 +1,12 @@
-# Test the build on Windows; does not create any assets.
+# Create Windows installer on a github push or release event
+# (upload to the release assets in the latter case).
 
 name: Windows 11
 
-on: [push]
+on:
+  push:
+  release:
+    types: [created]
 
 defaults:
     run:
@@ -121,13 +125,21 @@ jobs:
         VER=$(cat build/VERSION)
         echo "VERSION=$VER" >> $GITHUB_ENV
 
-    - name: Upload installer
+    - name: Upload installer as build artifact
       uses: actions/upload-artifact@v4
       with:
         name: cadabra2-windows-${{ matrix.name }}.msi
         path: build/cadabra2-${{ env.VERSION }}-win64.msi
         retention-days: 2
 
+    - name: Upload release assets
+      if:   github.event_name == 'release'
+      run: |
+        mv build/cadabra2-${{ env.VERSION }}-win64.msi build/cadabra2-${{ env.VERSION }}-windows-${{ matrix.name }}.msi
+        gh release upload "${{ env.GIT_TAG_VERSION }}" build/cadabra2-${{ env.VERSION }}-windows-${{ matrix.name }}.msi --clobber
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
   test:
     needs: msys2-ucrt64
     strategy:

core/CMakeLists.txt

@@ -539,12 +539,12 @@ if(NOT WIN32)
     set(CDB_BIN_PATH \"${CDB_BIN_PATH}\")
 
     # Remove old binary if it exists
-    file(REMOVE \"\${CMAKE_INSTALL_PREFIX}/\${CDB_BIN_PATH}/cadabra2\")
+    file(REMOVE \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/\${CDB_BIN_PATH}/cadabra2\")
     
     # Create symbolic link
     execute_process(
         COMMAND ${CMAKE_COMMAND} -E create_symlink cadabra2-cli cadabra2
-        WORKING_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/\${CDB_BIN_PATH}\"
+        WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/\${CDB_BIN_PATH}\"
     )
    ")
 endif()