From 45b4c49c1b5a4543b644cfcf42511946768372c2 Mon Sep 17 00:00:00 2001
From: Geoff Hutchison <geoff.hutchison@gmail.com>
Date: Wed, 4 Dec 2024 21:03:44 -0500
Subject: [PATCH] Restore the default Windows build (#1839)

* Restore the default Windows build

* Use Windows 2019 image
* Checkout full history to get build revision
* Only run sign-path build on push, not pull requests

Signed-off-by: Geoff Hutchison <geoff.hutchison@gmail.com>

---------

Signed-off-by: Geoff Hutchison <geoff.hutchison@gmail.com>
---
 .github/workflows/build_cmake.yml   | 49 +++++++++++------------------
 .github/workflows/build_windows.yml |  4 +--
 2 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
index 1650c28733..1f65240685 100644
--- a/.github/workflows/build_cmake.yml
+++ b/.github/workflows/build_cmake.yml
@@ -51,6 +51,15 @@ jobs:
             cmake_flags: "-G Ninja -DBUILD_MOLEQUEUE=OFF",
             cpack_flags: "-G DragNDrop",
           }
+        - {
+            name: "Windows Latest MSVC", artifact: "Win64.exe",
+            os: windows-2019,
+            cc: "cl", cxx: "cl",
+            build_type: "Release",
+            cmake_flags: "-DBUILD_MOLEQUEUE=OFF",
+            build_flags: "-j 2",
+            cpack_flags: "-G NSIS",
+          }
         - {
             name: "Ubuntu Address Sanitizer", artifact: "",
             os: ubuntu-20.04,
@@ -97,12 +106,6 @@ jobs:
         repository: openchemistry/openchemistry
         submodules: recursive
 
-    - name: Checkout avogadroapp
-      uses: actions/checkout@v4
-      with:
-        repository: openchemistry/avogadroapp
-        path: avogadroapp
-
     - name: Checkout molecules
       uses: actions/checkout@v4
       with:
@@ -127,10 +130,18 @@ jobs:
         repository: openchemistry/avogadro-i18n
         path: avogadro-i18n
 
+    - name: Checkout avogadroapp
+      uses: actions/checkout@v4
+      with:
+        repository: openchemistry/avogadroapp
+        path: avogadroapp
+        fetch-depth: 0
+
     - name: Checkout avogadrolibs
       uses: actions/checkout@v4
       with:
         path: avogadrolibs
+        fetch-depth: 0
 
     - name: Install Qt
       uses: jurplel/install-qt-action@v3
@@ -262,7 +273,7 @@ jobs:
         fi # password exists
 
     - name: Create Mac and Windows Packages
-      if: matrix.config.os == 'windows-latest' || runner.os == 'macOS'
+      if: runner.os == 'Windows' || runner.os == 'macOS'
       shell: bash
       run: |
         if [ -z "${P12_PASSWORD}" ]; then
@@ -271,7 +282,7 @@ jobs:
         if [ -z "${OPENSSL_ROOT_DIR}" ]; then
           unset OPENSSL_ROOT_DIR
         fi
-        [[ ! "${GITHUB_REF}" =~ "tags" ]] && export SNAPSHOT_DATE=`date -j "+%d-%m-%y"`
+        [[ ! "${GITHUB_REF}" =~ "tags" ]] && export SNAPSHOT_DATE=`date "+%d-%m-%y"`
         cpack ${{ matrix.config.cpack_flags }}
       working-directory: ${{ runner.workspace }}/build/avogadroapp
       continue-on-error: true
@@ -328,28 +339,6 @@ jobs:
         path: ${{ runner.workspace }}/build/avogadroapp/Avogadro*.*
         name: ${{ matrix.config.artifact }}
 
-    - name: Sign Windows artifact
-      if: matrix.config.os == 'windows-latest' && github.ref == 'refs/heads/master'
-      uses: signpath/github-action-submit-signing-request@v1
-      with:
-        api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
-        organization-id: '${{ secrets.SIGNPATH_ORG_ID }}'
-        project-slug: 'avogadrolibs'
-        signing-policy-slug: 'test-signing'
-        github-artifact-id: '${{ steps.upload-artifact.outputs.artifact-id }}'
-        wait-for-completion: true
-        output-artifact-directory: '${{ runner.workspace }}/build/avogadroapp'
-
-    - name: Notarize Mac DMG
-      if: matrix.config.os == 'windows-latest' && github.ref == 'refs/heads/master'
-      run: |
-        ls -la ./
-      working-directory: ${{ runner.workspace }}/build/avogadroapp
-
-    - name: Setup tmate session
-      if: failure()
-      uses: mxschmitt/action-tmate@v3
-
     - name: Cleanup
       if: ${{ always() }} # To ensure this step runs even when earlier steps fail
       shell: bash
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index 628ed84af2..380dc79a63 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -7,7 +7,7 @@ name: CMake Windows Build
 # .. since SignPath requires only a Windows build in the action
 # .. to successfully sign
 
-on: [push, pull_request, workflow_dispatch]
+on: [push, workflow_dispatch]
 
 env:
   QT_VERSION: 5.15.2
@@ -31,7 +31,7 @@ jobs:
             cc: "cl", cxx: "cl",
             build_type: "Release",
             cmake_flags: "-DBUILD_MOLEQUEUE=OFF",
-            build_flags: "-j 2",
+            build_flags: "",
             cpack_flags: "-G NSIS",
           }