diff options
| author | Micah Lee <micah@micahflee.com> | 2022-09-30 19:25:32 -0700 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2022-09-30 19:25:32 -0700 |
| commit | 803def4280b09f54053b3fcdc9902f3fe9cc791e (patch) | |
| tree | f45be6dbe6ce95d400e09803af9b939deabc76c1 /.github | |
| parent | d74a274138446446de572e5909454b4f6bee3759 (diff) | |
| download | onionshare-803def4280b09f54053b3fcdc9902f3fe9cc791e.tar.gz onionshare-803def4280b09f54053b3fcdc9902f3fe9cc791e.zip | |
Fix macOS syntax bugs, and trigger build on PRs
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yml | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 01ab9b73..81f2cf89 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,12 @@ run-name: Build win32, win64, mac (Intel) 🚀 on: push: branches: - - github-actions + - develop + - stable + pull_request: + branches: + - develop + - stable jobs: build-win64: @@ -224,16 +229,16 @@ jobs: - name: Restore cache - tor uses: actions/cache@v3 with: - path: desktop\build\tor + path: desktop/build/tor key: ${{ runner.os }}-macos-tor-${{ hashFiles('desktop/scripts/get-tor.py') }} - 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 uses: actions/cache@v3 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') }} - name: Build obfs4proxy @@ -263,7 +268,7 @@ jobs: - name: Restore cache - meek uses: actions/cache@v3 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') }} - name: Build meek @@ -290,4 +295,4 @@ jobs: - uses: actions/upload-artifact@v3 with: name: mac-build - path: ~\onionshare-macos.tar.gz + path: ~/onionshare-macos.tar.gz |