From: Marc Fehling <mafehling.git@gmail.com>
Date: Wed, 20 Sep 2023 05:57:19 +0000 (-0600)
Subject: github-windows: only create archive if on master.
X-Git-Tag: relicensing~485^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b045af11907e2776bfe6ad56fca44ab28ed2fdea;p=dealii.git

github-windows: only create archive if on master.
---

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index f35231c443..35dd73105c 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -56,27 +56,32 @@ jobs:
       shell: bash
       run: |
         cmake --build build --parallel 2 --target install
-        cd c:/project
-        7z a dealii-windows.zip *
     - name: test library
       shell: bash
       run: |
         cmake --build build --parallel 2 --target test
     - name: archive library
       # run only if a PR is merged into master
-      if: github.ref == 'refs/heads/master'
+      if: ${{ github.ref == 'refs/heads/master' }}
+      shell: bash
+      run: |
+        cd c:/project
+        7z a dealii-windows.zip *
+    - name: upload library
+      # run only if a PR is merged into master
+      if: ${{ github.ref == 'refs/heads/master' }}
       uses: actions/upload-artifact@v3
       with:
         name: dealii-windows.zip
         path: c:/project/dealii-windows.zip
-    - name: archive error 1
+    - name: upload CMakeOutput
       uses: actions/upload-artifact@v3
       if: always()
       continue-on-error: true
       with:
         name: windows-serial-CMakeOutput.log
         path: build/CMakeFiles/CMakeOutput.log
-    - name: archive error 2
+    - name: upload CMakeError
       uses: actions/upload-artifact@v3
       if: always()
       continue-on-error: true