From 707bb5b948312a0ad7f3073c1e1ab46d58d1bf04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=B5ivo=20Leedj=C3=A4rv?= <toivol@gmail.com>
Date: Thu, 19 Dec 2024 15:08:07 +0100
Subject: [PATCH 1/2] GHA: Remove needless use of environment

Generic scripts based on environment variables were propably intended to
craft a sort of template workflow that could be used in many projects.
Since this workflow is heavily project-specific anyway, remove such
usage of environment to reduce complexity (and possibly reduce attack
surface).
---
 .github/workflows/CI.yml | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 7235ccace..a87910435 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -1,10 +1,5 @@
 name: CI
 
-env:
-  PROJECT_NAME: unison
-  PROJECT_DESC: "`unison` file synchronizer"
-  PROJECT_EXES: "unison unison-fsmonitor"
-
 on:
   - pull_request
   - push
@@ -101,7 +96,7 @@ jobs:
         PKG_suffix='.tar.gz' ; case '${{ matrix.job.os }}' in windows-*) PKG_suffix='.zip' ;; esac;
         PKG_VER="${REF_TAG:-git_$REF_SHAS}"
         PKG_VER="${PKG_VER#v}"
-        PKG_BASENAME="${PROJECT_NAME}-${PKG_VER}${{ matrix.job.fnsuffix }}"
+        PKG_BASENAME="unison-${PKG_VER}${{ matrix.job.fnsuffix }}"
         PKG_NAME="${PKG_BASENAME}${PKG_suffix}"
         PKG_DIR="${STAGING_DIR}/${PKG_BASENAME}"
         outputs PKG_VER PKG_BASENAME PKG_DIR PKG_NAME PKG_suffix
@@ -143,7 +138,7 @@ jobs:
         opam exec -- make fsmonitor
         # stage
         # * notes: darwin/macos doesn't build `unison-fsmonitor`
-        for file in ${PROJECT_EXES} ; do
+        for file in unison unison-fsmonitor ; do
           if [ -f "src/${file}${{ steps.vars.outputs.EXE_suffix }}" ]; then
             cp "src/${file}${{ steps.vars.outputs.EXE_suffix }}" '${{ steps.vars.outputs.PKG_DIR }}/bin'
             echo "'src/${file}${{ steps.vars.outputs.EXE_suffix }}' copied to '${{ steps.vars.outputs.PKG_DIR }}/bin'"
@@ -460,22 +455,18 @@ jobs:
       run: |
         opam exec -- make gui
         # stage
-        # * copy only main/first project binary
-        project_exe_stem=${PROJECT_EXES%% *}
-        cp "src/${project_exe_stem}-gui${{ steps.vars.outputs.EXE_suffix }}" "${{ steps.vars.outputs.PKG_DIR }}/bin/"
+        cp "src/unison-gui${{ steps.vars.outputs.EXE_suffix }}" "${{ steps.vars.outputs.PKG_DIR }}/bin/"
 
     - name: "Build WinOS text+gui hybrid"
       if: ${{ runner.os == 'Windows' && !matrix.job.static && !contains(matrix.job.ocaml-version, 'msvc') }} ## WinOS, non-static (unable to build static gtk/gui)
       shell: bash
       run: |
         # create and stage text+gui hybrid for Windows
-        # * copy only main/first project binary
-        project_exe_stem=${PROJECT_EXES%% *}
         # * clean/remove build artifact(s)
-        rm "src/${project_exe_stem}-gui${{ steps.vars.outputs.EXE_suffix }}" ##.or.# opam exec -- make -C src clean #.or.# opam exec -- make clean
+        rm "src/unison-gui${{ steps.vars.outputs.EXE_suffix }}" ##.or.# opam exec -- make -C src clean #.or.# opam exec -- make clean
         # * re-create (with hybrid text+gui UI)
         opam exec -- make gui UI_WINOS=hybrid
-        cp "src/${project_exe_stem}-gui${{ steps.vars.outputs.EXE_suffix }}" "${{ steps.vars.outputs.PKG_DIR }}/bin/${project_exe_stem}-text+gui${{ steps.vars.outputs.EXE_suffix }}"
+        cp "src/unison-gui${{ steps.vars.outputs.EXE_suffix }}" "${{ steps.vars.outputs.PKG_DIR }}/bin/unison-text+gui${{ steps.vars.outputs.EXE_suffix }}"
 
     - uses: actions/upload-artifact@v4
       if: false ## disable by default; only useful for debugging GHA
@@ -1126,7 +1117,7 @@ jobs:
         unset REF_TAG ; case "${GITHUB_REF}" in refs/tags/*) REF_TAG="${GITHUB_REF#refs/tags/}" ;; esac;
         PKG_VER="${REF_TAG:-git_$REF_SHAS}"
         PKG_VER="${PKG_VER#v}"
-        echo PKG_NAME="${PROJECT_NAME}-${PKG_VER}${{ matrix.job.fnsuffix }}.tar.gz" >> $GITHUB_OUTPUT
+        echo PKG_NAME="unison-${PKG_VER}${{ matrix.job.fnsuffix }}.tar.gz" >> $GITHUB_OUTPUT
         echo REF_SHAS=${REF_SHAS} >> $GITHUB_OUTPUT
 
     - uses: actions/upload-artifact@v4

From 1f76f535baeae9ba111286a3a5fbdc18bd00ff20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=B5ivo=20Leedj=C3=A4rv?= <toivol@gmail.com>
Date: Thu, 19 Dec 2024 15:17:20 +0100
Subject: [PATCH 2/2] GHA: Run NMAKE in pure Windows builds

---
 .github/workflows/CI.yml | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index a87910435..7aa958335 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -102,6 +102,7 @@ jobs:
         outputs PKG_VER PKG_BASENAME PKG_DIR PKG_NAME PKG_suffix
         COMPRESS_CMD='tar czf'; case '${{ matrix.job.os }}' in windows-*) COMPRESS_CMD='7z -y a' ;; esac;
         outputs COMPRESS_CMD
+        case '${{ matrix.job.ocaml-version }}' in *msvc*) echo "_MAKE=nmake" >> $GITHUB_ENV ;; *) echo "_MAKE=make" >> $GITHUB_ENV ;; esac
 
     - name: Create/configure any needed build/workspace
       shell: bash
@@ -130,22 +131,15 @@ jobs:
       run: |
         echo SHELLOPTS=igncr>> %GITHUB_ENV%
 
-    - shell: bash
+    - run: |
+        opam exec -- ${{ env._MAKE }} tui fsmonitor
+        # stage
+        cp "src/unison${{ steps.vars.outputs.EXE_suffix }}" "${{ steps.vars.outputs.PKG_DIR }}/bin" || echo unison${{ steps.vars.outputs.EXE_suffix }} not built
+        cp "src/unison-fsmonitor${{ steps.vars.outputs.EXE_suffix }}" "${{ steps.vars.outputs.PKG_DIR }}/bin" || echo unison-fsmonitor${{ steps.vars.outputs.EXE_suffix }} not built
       env:
         LDFLAGS: ${{ matrix.job.static }}
-      run: |
-        opam exec -- make tui
-        opam exec -- make fsmonitor
-        # stage
-        # * notes: darwin/macos doesn't build `unison-fsmonitor`
-        for file in unison unison-fsmonitor ; do
-          if [ -f "src/${file}${{ steps.vars.outputs.EXE_suffix }}" ]; then
-            cp "src/${file}${{ steps.vars.outputs.EXE_suffix }}" '${{ steps.vars.outputs.PKG_DIR }}/bin'
-            echo "'src/${file}${{ steps.vars.outputs.EXE_suffix }}' copied to '${{ steps.vars.outputs.PKG_DIR }}/bin'"
-          fi
-        done
 
-    - run: opam exec -- make test
+    - run: opam exec -- ${{ env._MAKE }} test
 
     ## There is still code to run tests with old ocaml on Windows.
     ## That remains intentionally so that someone could turn it on if
@@ -451,9 +445,8 @@ jobs:
       run: opam install lablgtk3 ocamlfind
 
     - if: ${{ !matrix.job.static }} ## unable to build static gtk/gui
-      shell: bash
       run: |
-        opam exec -- make gui
+        opam exec -- ${{ env._MAKE }} gui
         # stage
         cp "src/unison-gui${{ steps.vars.outputs.EXE_suffix }}" "${{ steps.vars.outputs.PKG_DIR }}/bin/"