diff options
| -rw-r--r-- | .github/workflows/build.yml | 14 | ||||
| -rwxr-xr-x | bin/build-distribution-archives | 20 |
2 files changed, 13 insertions, 21 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a79b98a..0b672662 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,7 +41,6 @@ jobs: - shell: bash run: | make dist - find . env: BUILD: windows - uses: actions/upload-artifact@master @@ -60,10 +59,20 @@ jobs: - name: download inkscape shell: bash run: | - curl -sOL https://inkscape.org/en/gallery/item/12187/inkscape-0.92.3.tar.bz2 + curl -sOL https://inkscape.org/en/gallery/item/12187/inkscape-0.92.3.tar.bz2 - name: install dependencies shell: bash run: | + brew update + + # the 3 in pygobject3 signifies gtk3, not python3 + brew install pygobject3 gtk+3 + + # for msgfmt + brew link gettext --force + + echo "::set-env name=GI_TYPELIB_PATH::/usr/local/lib/girepository-1.0/" + pip install -r requirements.txt pip install pyinstaller==3.3.1 @@ -75,7 +84,6 @@ jobs: - shell: bash run: | make dist - find . env: BUILD: osx - uses: actions/upload-artifact@master diff --git a/bin/build-distribution-archives b/bin/build-distribution-archives index d1a30014..4aa83edf 100755 --- a/bin/build-distribution-archives +++ b/bin/build-distribution-archives @@ -2,18 +2,9 @@ # TRAVIS_BRANCH is the branch name or the name of the tag. VERSION="$(echo ${TRAVIS_BRANCH:-${GITHUB_REF}} | tr / -)" -OS="${TRAVIS_OS_NAME:-$(uname)}" +OS="${TRAVIS_OS_NAME:-${BUILD:-$(uname)}}" ARCH="$(uname -m)" -MACVERSION="${TRAVIS_OSX_IMAGE}" -if [ "${MACVERSION}" = "xcode9.2" ]; then - MACVERSION="sierra" -elif [ "${MACVERSION}" = "xcode9.4" ]; then - MACVERSION="high_sierra" -elif [ "${MACVERSION}" = "xcode10.2" ]; then - MACVERSION="mojave" -fi - cp -a images/examples palettes symbols fonts dist/inkstitch cp -a icons locales print dist/inkstitch/bin @@ -31,13 +22,6 @@ for d in inx/*; do cp $d/*.inx dist cd dist - if [ "$BUILD" = "windows" ]; then - echo - python -m zipfile -c ../artifacts/inkstitch-${VERSION}-win32-${lang}.zip * - elif [ "$BUILD" = "osx" ]; then - tar zcf ../artifacts/inkstitch-${VERSION}-${OS}-${MACVERSION}-${ARCH}-$lang.tar.gz * - else - tar zcf ../artifacts/inkstitch-${VERSION}-${OS}-${ARCH}-$lang.tar.gz * - fi + python -m zipfile -c ../artifacts/inkstitch-${VERSION}-${OS}-${lang}.zip * cd .. done |