diff options
| author | Kaalleen <reni@allenka.de> | 2022-02-18 18:55:25 +0100 |
|---|---|---|
| committer | Kaalleen <reni@allenka.de> | 2022-05-04 19:18:21 +0200 |
| commit | 7bd5dd6b50999ad46fb8d18b75724107f08f3d61 (patch) | |
| tree | 52ce3e0f54fb48d35a4ccdd192c41a0b965a1a14 | |
| parent | d4bead109ec4c693da0f47b9c0fddbc631a533cb (diff) | |
test with macos python 3.8.x
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rwxr-xr-x | bin/build-python | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 74fe8f6b..44a68643 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -143,7 +143,7 @@ jobs: submodules: recursive - uses: actions/setup-python@v2 with: - python-version: '3.9.x' + python-version: '3.8.x' - uses: actions/setup-node@v1 with: node-version: '16.x' diff --git a/bin/build-python b/bin/build-python index 3cc3139b..195248c3 100755 --- a/bin/build-python +++ b/bin/build-python @@ -38,13 +38,7 @@ pyinstaller_args+="--log-level DEBUG " # This adds bundle identifier in reverse DSN format for macos if [ "$BUILD" = "osx" ]; then pyinstaller_args+="--osx-bundle-identifier org.inkstitch.app " -<<<<<<< HEAD pyinstaller_args+="-i electron/build/icons/mac/inkstitch.icns" -======= - # in macOS we get an error when building libgfortran: incompatible with target arch x86_64 (has arch: arm64)! - # let's try if this fixes it - pyinstaller_args+="--target-arch x86_64 " ->>>>>>> bcf63fec (test to build with specified arch (macOS)) if [[ -z ${GITHUB_REF} ]]; then echo "Dev or Local Build" else |