Skip to content

Commit

Permalink
Upgrage MacOS image to 11
Browse files Browse the repository at this point in the history
  • Loading branch information
interlark committed Jul 19, 2022
1 parent 38199b4 commit f4ef4de
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 24 deletions.
28 changes: 5 additions & 23 deletions .github/workflows/dev_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- os: ubuntu-20.04
dist: linux

- os: macos-10.15
- os: macos-11
dist: macos

- os: windows-2019
Expand All @@ -38,33 +38,15 @@ jobs:
python -m pip install -r requirements.txt
python -m pip install -r requirements-dev.txt
- name: Get master short SHA
id: get_master_sha
run: echo "::set-output name=master_sha_short::$(git rev-parse origin/master | cut -c1-7)"
shell: bash

- name: Get GUI short SHA
id: get_gui_sha
run: echo "::set-output name=gui_sha_short::$(git rev-parse origin/gui | cut -c1-7)"
shell: bash

- name: Build standalone app
run: |
python scripts/build.py
- name: Archive Windows distributive
if: matrix.dist == 'windows'
run: pushd dist && 7z a ../ustvgo-iptv-dev_build-${{steps.get_master_sha.outputs.master_sha_short}}_${{steps.get_gui_sha.outputs.gui_sha_short}}-${{matrix.dist}}.zip ustvgo-iptv.exe && popd
shell: bash

- name: Archive Linux/MacOS distributive
if: matrix.dist != 'windows'
run: tar -C dist/ -czvf ustvgo-iptv-dev_build-${{steps.get_master_sha.outputs.master_sha_short}}_${{steps.get_gui_sha.outputs.gui_sha_short}}-${{matrix.dist}}.tar.gz ustvgo-iptv
shell: bash

- name: Upload distributive
uses: actions/upload-artifact@v3
with:
name: dist-${{ matrix.dist }}
path: ustvgo-iptv-*
name: ustvgo-iptv-dev-${{matrix.dist}}
path: |
dist/ustvgo-iptv
dist/ustvgo-iptv.exe
retention-days: 30
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- os: ubuntu-20.04
dist: linux

- os: macos-10.15
- os: macos-11
dist: macos

- os: windows-2019
Expand Down

0 comments on commit f4ef4de

Please sign in to comment.