Merge pull request #11 from eccentricOrange/wfmatrices

Wfmatrices
eccentricOrange · Feb 6, 2022 · f6c7e8f · f6c7e8f
2 parents 7d4687a + 5676de4
commit f6c7e8f
Showing 1 changed file with 16 additions and 22 deletions.
diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -4,9 +4,19 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os:
+          - ubuntu
+          - windows
+          - macos
         architecture: ['x64']
-    runs-on: ${{ matrix.os }}
+        include:
+          - os: windows
+            data-file: "data/schema.sql;schema.sql"
+          - os: macos
+            data-file: "data/schema.sql:schema.sql"
+          - os: ubuntu
+            data-file: "data/schema.sql:schema.sql"
+    runs-on: ${{ matrix.os }}-latest
     name: ${{ matrix.os }}-${{ matrix.architecture }}
     steps:
       - uses: actions/checkout@v2
@@ -17,33 +27,14 @@ jobs:
       - run: pip install -r requirements.txt pyinstaller
       - run: mkdir build
       - run: mkdir bin
-      - run: pyinstaller --distpath bin --clean --add-data data/schema.sql:schema.sql --onefile --name npbc_cli-${{ matrix.os }}-${{ matrix.architecture }} npbc_cli.py
+      - run: pyinstaller --distpath bin --clean --add-data "${{ matrix.data-file }}" --onefile --name npbc_cli-${{ matrix.os }}-${{ matrix.architecture }} npbc_cli.py
       - uses: actions/upload-artifact@v2
         with:
           path: bin
           name: npbc_cli-${{ matrix.os }}-${{ matrix.architecture }}
-
-  build-win:
-    runs-on: windows-latest
-    name: windows-latest-x64
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        with:
-          python-version: '3.10'
-          architecture: x64
-      - run: pip install -r requirements.txt pyinstaller
-      - run: mkdir build
-      - run: mkdir bin
-      - run: pyinstaller --distpath bin --clean --add-data "data/schema.sql;schema.sql" --onefile --name npbc_cli-windows-latest-x64.exe npbc_cli.py
-      - uses: actions/upload-artifact@v2
-        with:
-          path: bin
-          name: npbc_cli-windows-latest-x64
 
   release:
     needs:
-      - build-win
       - build
     if: startsWith(github.ref, 'refs/tags/v')
     runs-on: ubuntu-latest
@@ -59,3 +50,6 @@ jobs:
       with:
         artifacts: "bin/npbc_cli*/*"
         token: ${{ secrets.GITHUB_TOKEN }}
+        generateReleaseNotes: true
+        artifactErrorsFailBuild: true
+        prerelease: true