Fix macOS syntax bugs, and trigger build on PRs

This commit is contained in:
Micah Lee 2022-09-30 19:25:32 -07:00
parent d74a274138
commit 803def4280
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73

View File

@ -3,7 +3,12 @@ run-name: Build win32, win64, mac (Intel) 🚀
on: on:
push: push:
branches: branches:
- github-actions - develop
- stable
pull_request:
branches:
- develop
- stable
jobs: jobs:
build-win64: build-win64:
@ -224,16 +229,16 @@ jobs:
- name: Restore cache - tor - name: Restore cache - tor
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: desktop\build\tor path: desktop/build/tor
key: ${{ runner.os }}-macos-tor-${{ hashFiles('desktop/scripts/get-tor.py') }} key: ${{ runner.os }}-macos-tor-${{ hashFiles('desktop/scripts/get-tor.py') }}
- name: Get tor binaries from Tor Browser - name: Get tor binaries from Tor Browser
run: cd desktop && poetry run python .\scripts\get-tor.py macos run: cd desktop && poetry run python ./scripts/get-tor.py macos
- name: Restore cache - obfs4proxy - name: Restore cache - obfs4proxy
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: desktop\onionshare\resources\tor\obfs4proxy.exe path: desktop/onionshare/resources/tor/obfs4proxy
key: ${{ runner.os }}-macos-obfs4proxy-${{ hashFiles('desktop/scripts/build-pt-obfs4proxy.sh') }} key: ${{ runner.os }}-macos-obfs4proxy-${{ hashFiles('desktop/scripts/build-pt-obfs4proxy.sh') }}
- name: Build obfs4proxy - name: Build obfs4proxy
@ -263,7 +268,7 @@ jobs:
- name: Restore cache - meek - name: Restore cache - meek
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: desktop\onionshare\resources\tor\meek-client path: desktop/onionshare/resources/tor/meek-client
key: ${{ runner.os }}-macos-meek-${{ hashFiles('desktop/scripts/build-pt-meek.sh') }} key: ${{ runner.os }}-macos-meek-${{ hashFiles('desktop/scripts/build-pt-meek.sh') }}
- name: Build meek - name: Build meek
@ -290,4 +295,4 @@ jobs:
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
with: with:
name: mac-build name: mac-build
path: ~\onionshare-macos.tar.gz path: ~/onionshare-macos.tar.gz