Browse Source

feat(macOS): Build deps from source, giving backwards compatibility

Keep second CI job building with deps from brew, to test the workflow of a user
building qTox from source, with deps from brew.

Fix #6260
reviewable/pr6588/r8
Anthony Bilinski 3 years ago
parent
commit
e80db6a532
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
  1. 27
      .github/workflows/build-test-deploy.yaml

27
.github/workflows/build-test-deploy.yaml

@ -500,9 +500,9 @@ jobs:
replacesArtifacts: true replacesArtifacts: true
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
artifacts: "qtox-nightly-i686-${{ matrix.build_type }}.exe,qtox-nightly-i686-${{ matrix.build_type }}.exe.sha256" artifacts: "qtox-nightly-i686-${{ matrix.build_type }}.exe,qtox-nightly-i686-${{ matrix.build_type }}.exe.sha256"
build-osx: build-osx-distributable:
name: macOS name: macOS distributable
runs-on: macos-10.15 runs-on: macos-latest
needs: update-nightly-tag needs: update-nightly-tag
if: | if: |
always() && always() &&
@ -512,12 +512,12 @@ jobs:
contents: write contents: write
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: homebrew - name: Homebrew dependencies to build dependencies
run: brew upgrade && brew bundle --file ./osx/Brewfile run: brew upgrade && brew bundle --file ./osx/Brewfile-DepBuildDeps
- name: Install toxcore and toxext - name: Build dependencies
run: buildscripts/build_toxcore_linux.sh run: ./.ci-scripts/build-osx-deps.sh
- name: Build qTox - name: Build qTox
run: ./.ci-scripts/build-qtox-macos.sh user run: ./.ci-scripts/build-qtox-macos.sh dist
- name: Upload dmg - name: Upload dmg
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
@ -551,6 +551,17 @@ jobs:
replacesArtifacts: true replacesArtifacts: true
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
artifacts: "qTox-nightly.dmg,qTox-nightly.dmg.sha256" artifacts: "qTox-nightly.dmg,qTox-nightly.dmg.sha256"
build-osx-users:
name: macOS user
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- name: Homebrew
run: brew upgrade && brew bundle --file ./osx/Brewfile
- name: Install toxcore and toxext
run: buildscripts/build_toxcore_linux.sh
- name: Build qTox
run: ./.ci-scripts/build-qtox-macos.sh user
build-docs: build-docs:
name: Docs name: Docs
runs-on: ubuntu-latest runs-on: ubuntu-latest

Loading…
Cancel
Save