Index: /trunk/.github/workflows/ant.yml
===================================================================
--- /trunk/.github/workflows/ant.yml	(revision 18138)
+++ /trunk/.github/workflows/ant.yml	(revision 18139)
@@ -75,9 +75,4 @@
         java: [8, 11, 16, 17-ea, 18-ea]
         os: [ubuntu-latest, macos-latest, windows-latest]
-        exclude:
-          - java: 8
-            os: macos-latest
-          - java: 11
-            os: macos-latest
     name: Java ${{ matrix.java }} on ${{ matrix.os }}
     steps:
@@ -143,5 +138,5 @@
 
       - name: Build and package for macOS
-        if: ${{ runner.os == 'macos' && always() }}
+        if: ${{ runner.os == 'macos' && (matrix.java == '16' || matrix.java == '17-ea' || matrix.java == '18-ea' ) && always() }}
         env:
           CERT_MACOS_P12: ${{ secrets.CERT_MACOS_P12 }}
@@ -152,15 +147,15 @@
 
       - name: Build and package for Windows
-        if: ${{ runner.os == 'windows' && always() }}
+        if: ${{ runner.os == 'windows' && (matrix.java == '16' || matrix.java == '17-ea' || matrix.java == '18-ea' ) && always() }}
         run: |
           if [ ! -f tools/${{ env.WIX_HOME }}-binaries.zip ]; then
             curl -o tools/${{ env.WIX_HOME }}-binaries.zip ${{ env.WIX_URL }}
           fi
-          Expand-Archive -Path tools/${{ env.WIX_HOME }}-binaries.zip -DestinationPath ${{ env.WIX_HOME }}
+          PowerShell -Command Expand-Archive -Path tools/${{ env.WIX_HOME }}-binaries.zip -DestinationPath ${{ env.WIX_HOME }}
           echo "${{ env.WIX_HOME }}" >> $GITHUB_PATH
           ./native/windows/win-jpackage.sh ${{ needs.createrelease.outputs.josm_revision }}
 
       - name: Upload macOS app
-        if: ${{ runner.os == 'macos' && always() }}
+        if: ${{ runner.os == 'macos' && (matrix.java == '16' || matrix.java == '17-ea' || matrix.java == '18-ea' ) && always() }}
         id: upload-app
         uses: actions/upload-release-asset@v1
@@ -174,5 +169,5 @@
 
       - name: Upload Windows Installer package
-        if: ${{ runner.os == 'windows' && always() }}
+        if: ${{ runner.os == 'windows' && (matrix.java == '16' || matrix.java == '17-ea' || matrix.java == '18-ea' ) && always() }}
         id: upload-msi
         uses: actions/upload-release-asset@v1