From dd302c9750d87d1874922078c890513daf55e035 Mon Sep 17 00:00:00 2001 From: hanzhi713 Date: Wed, 26 Jan 2022 10:22:22 -0500 Subject: [PATCH] add macos 11 build --- .github/workflows/build_executable.yaml | 28 +++++++++++++++++++++---- build_scripts/build.sh | 6 +++++- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_executable.yaml b/.github/workflows/build_executable.yaml index 2c7ebe1..1dd2c12 100644 --- a/.github/workflows/build_executable.yaml +++ b/.github/workflows/build_executable.yaml @@ -17,16 +17,36 @@ jobs: - name: Build run: | . ./build_scripts/install_dependencies.sh macos - . ./build_scripts/build.sh macos + . ./build_scripts/build.sh macos 10.15 - name: Release uses: softprops/action-gh-release@v1 # if: startsWith(github.ref, 'refs/tags/') with: draft: true files: | - ./dist/photomosaic-maker-${{ env.VERSION }}-macos-x64 - ./dist/photomosaic-maker-${{ env.VERSION }}-macos-x64.tar.gz - ./photomosaic-maker-${{ env.VERSION }}-macos-x64-build.tar.gz + ./dist/photomosaic-maker-${{ env.VERSION }}-macos-10.15-x64 + ./dist/photomosaic-maker-${{ env.VERSION }}-macos-10.15-x64.tar.gz + ./photomosaic-maker-${{ env.VERSION }}-macos-10.15-x64-build.tar.gz + build-macos11: + runs-on: macos-11 + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: '3.9' + - name: Build + run: | + . ./build_scripts/install_dependencies.sh macos + . ./build_scripts/build.sh macos 11 + - name: Release + uses: softprops/action-gh-release@v1 + # if: startsWith(github.ref, 'refs/tags/') + with: + draft: true + files: | + ./dist/photomosaic-maker-${{ env.VERSION }}-macos-11-x64 + ./dist/photomosaic-maker-${{ env.VERSION }}-macos-11-x64.tar.gz + ./photomosaic-maker-${{ env.VERSION }}-macos-11-x64-build.tar.gz build-linux: runs-on: ubuntu-18.04 steps: diff --git a/build_scripts/build.sh b/build_scripts/build.sh index 5178a05..0791672 100755 --- a/build_scripts/build.sh +++ b/build_scripts/build.sh @@ -1,6 +1,10 @@ #!/bin/bash PLATFORM=$1 -NAME=photomosaic-maker-${VERSION}-$PLATFORM-x64 +PLATV=$2 +if [[ $2 != "" ]]; then + PLATV="-$2" +fi +NAME=photomosaic-maker-${VERSION}-${PLATFORM}${PLATV}-x64 rm -rf dist/*