Simplify Windows builds

* Create packages for Windows in package workflow
* Extract and reuse Windows build workflow
* Don't create artifacts when not necessary

Author: alcaeus

.github/workflows/build-package-files.yml renamed to .github/workflows/package-release.yml

@@ -1,4 +1,4 @@
-name: "Build package files"
+name: "Package Release"
 
 on:
   push:
@@ -10,7 +10,7 @@ on:
 
 jobs:
   build-pecl:
-    name: "Create release package"
+    name: "Create PECL package"
     runs-on: "ubuntu-latest"
 
     steps:
@@ -59,3 +59,58 @@ jobs:
         continue-on-error: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  build-windows:
+    name: "Create Windows package"
+    runs-on: windows-2022
+    defaults:
+      run:
+        shell: cmd
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # Note: keep this in sync with the Windows matrix in windows-tests.yml
+        php: [ "7.4", "8.0", "8.1", "8.2", "8.3" ]
+        arch: [ x64, x86 ]
+        ts: [ ts, nts ]
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+          submodules: true
+
+      - name: "Build Driver"
+        id: build-driver
+        uses: ./.github/workflows/windows/build
+        with:
+          version: ${{ matrix.php }}
+          arch: ${{ matrix.arch }}
+          ts: ${{ matrix.ts }}
+
+      - name: "Copy DLL and PDB files to CWD"
+        run: |
+          cp %BUILD_DIR%\php_mongodb.dll .
+          cp %BUILD_DIR%\php_mongodb.pdb .
+        env:
+          BUILD_DIR: ${{ steps.build-driver.outputs.build-dir }}
+
+      - name: "Upload DLL and PDB files as build artifacts"
+        uses: actions/upload-artifact@v4
+        with:
+          name: php_mongodb-${{ github.ref_name }}-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.arch }}
+          path: |
+            php_mongodb.dll
+            php_mongodb.pdb
+          retention-days: 3
+
+      - name: "Create and upload release artifact"
+        if: ${{ github.ref_type == 'tag' }}
+        run: |
+          ARCHIVE=php_mongodb-${{ github.ref_name }}-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.arch }}.zip
+          zip $ARCHIVE php_mongodb.dll php_mongodb.pdb CREDITS CONTRIBUTING.md LICENSE README.md THIRD_PARTY_NOTICES
+          gh release upload ${{ github.ref_name }} $ARCHIVE
+          continue-on-error: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/windows-release-build.yml

@@ -7,8 +7,6 @@ on:
       - "master"
       - "feature/*"
   push:
-    tags:
-      - "*"
     branches:
       - "v*.*"
       - "master"
@@ -36,50 +34,26 @@ jobs:
           fetch-depth: 2
           submodules: true
 
-      - name: Prepare build environment
-        id: prepare-build
-        uses: ./.github/workflows/windows/prepare-build
+      - name: "Build Driver"
+        id: build-driver
+        uses: ./.github/workflows/windows/build
         with:
           version: ${{ matrix.php }}
           arch: ${{ matrix.arch }}
           ts: ${{ matrix.ts }}
 
-      - name: Build driver
-        run: nmake /nologo
-
       - name: Cache build artifacts for subsequent builds
         id: cache-build-artifacts
         uses: actions/cache/save@v4
         with:
           key: ${{ github.sha }}-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.arch }}
           path: |
-            ${{ steps.prepare-build.outputs.build-dir }}\php_mongodb.dll
-            ${{ steps.prepare-build.outputs.build-dir }}\php_mongodb.pdb
-
-      - name: Copy DLL and PDB files to CWD
-        if: ${{ github.event_name == 'push' }}
-        run: |
-          cp .github/workflows/get-build-dir.bat .
-          for /F "usebackq tokens=*" %%i in (`get-build-dir.bat`) do set BUILD_DIR=%%i
-          echo BUILD_DIR=%BUILD_DIR%
-          cp %BUILD_DIR%\php_mongodb.dll .
-          cp %BUILD_DIR%\php_mongodb.pdb .
-
-      - name: Upload DLL and PDB files as build artifacts
-        if: ${{ github.event_name == 'push' }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: php_mongodb-${{ github.sha }}-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.arch }}
-          path: |
-            php_mongodb.dll
-            php_mongodb.pdb
-          retention-days: 3
+            ${{ steps.build-driver.outputs.build-dir }}\php_mongodb.dll
+            ${{ steps.build-driver.outputs.build-dir }}\php_mongodb.pdb
 
   test:
     name: "Windows Tests"
     runs-on: windows-2022
-    # Run tests only when pushing to a branch. When pushing a tag, we're only interested in building the DLLs.
-    if: ${{ github.ref_type == 'branch' }}
     needs: build
     defaults:
       run:

.github/workflows/windows-tests.yml

@@ -0,0 +1,30 @@
+name: "Build DLL files for Windows"
+description: "Prepares the PHP build environment for the MongoDB driver"
+inputs:
+  version:
+    description: "PHP version to build for"
+    required: true
+  arch:
+    description: "The architecture to build for (x64 or x86)"
+    required: true
+  ts:
+    description: "Thread-safety (nts or ts)"
+    required: true
+outputs:
+  build-dir:
+    description: "The build directory to be used"
+    value: ${{ steps.prepare-build-env.outputs.build-dir }}
+runs:
+  using: composite
+  steps:
+    - name: Prepare build environment
+      id: prepare-build-env
+      uses: ./.github/workflows/windows/prepare-build
+      with:
+        version: ${{ inputs.version }}
+        arch: ${{ inputs.arch }}
+        ts: ${{ inputs.ts }}
+
+    - name: Build driver
+      shell: cmd
+      run: nmake /nologo