fix windows build

hanzhi713 · Jul 24, 2022 · 08c9774 · 08c9774
1 parent 06d0225
commit 08c9774
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build_executable.yaml b/.github/workflows/build_executable.yaml
@@ -6,12 +6,11 @@ env:
   VERSION: "5.0"
 
 jobs:
-  # in theory we can use build matrix, but it has some complications so I will just repeat here
   build-matrix:
-    runs-on: macos-10.15
     strategy:
       matrix:
         os: [ubuntu-18.04, ubuntu-20.04, windows-2019, macos-10.15, macos-11, macos-12]
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2
@@ -21,6 +20,7 @@ jobs:
       run: |
         . ./build_scripts/install_dependencies.sh ${{ matrix.os }}
         . ./build_scripts/build.sh ${{ matrix.os }}
+      shell: bash
     - name: Release
       uses: softprops/action-gh-release@v1
       # if: startsWith(github.ref, 'refs/tags/')

diff --git a/build_scripts/build.sh b/build_scripts/build.sh
@@ -5,7 +5,7 @@ NAME=photomosaic-maker-${VERSION}-${PLATFORM}-x64
 rm -rf dist/*
 
 if [[ $PLATFORM == windows* ]]; then
-    ./Scripts/activate
+    ./collage/Scripts/activate
     SUFFIX=".exe"
 elif [[ $PLATFORM == macos* ]]; then
     source collage/bin/activate

diff --git a/build_scripts/install_dependencies.sh b/build_scripts/install_dependencies.sh
@@ -2,7 +2,7 @@
 python3 -m venv collage
 PLATFORM=$1
 if [[ $PLATFORM == windows* ]]; then
-    ./Scripts/activate
+    ./collage/Scripts/activate
 elif [[ $PLATFORM == macos* ]]; then
     source collage/bin/activate
 elif [[ $PLATFORM == ubuntu* ]]; then