Fix m1 version (#7321)

* Rename job - not catalina

* Cleanup leftovers from previous runs. #7309
This commit is contained in:
Chris Marslender 2021-07-09 21:56:03 -07:00 committed by GitHub
parent d6e6c704c7
commit 5af2f3d216
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -27,39 +27,24 @@ jobs:
with:
access_token: ${{ github.token }}
- name: Cleanup any leftovers that exist from previous runs
run: |
rm -rf ../venv || true
rm -rf venv || true
rm -rf chia_blockchain.egg-info || true
rm -rf build_scripts/final_installer || true
rm -rf build_scripts/dist || true
rm -rf build_scripts/pyinstaller || true
rm -rf chia-blockchain-gui/build || true
rm -rf chia-blockchain-gui/daemon || true
rm -rf chia-blockchain-gui/node_modules || true
- name: Checkout Code
uses: actions/checkout@v2
with:
fetch-depth: 0
submodules: recursive
- name: Cache npm
uses: actions/cache@v2.1.6
env:
cache-name: cache-node-modules
with:
# npm cache files are stored in `~/.npm` on Linux/macOS
path: ~/.npm
key: m1-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
m1-build-${{ env.cache-name }}-
m1-build-
m1-
- name: Get pip cache dir
id: pip-cache
run: |
echo "::set-output name=dir::$(arch -arm64 pip cache dir)"
- name: Cache pip
uses: actions/cache@v2.1.6
with:
# Note that new runners may break this https://github.com/actions/cache/issues/292
path: ${{ steps.pip-cache.outputs.dir }}
key: m1-pip-${{ hashFiles('**/setup.py') }}
restore-keys: |
m1-pip-
- name: Test for secrets access
id: check_secrets
shell: bash
@ -109,7 +94,7 @@ jobs:
run: |
arch -arm64 brew install node@12
- name: Build MacOS DMG in Catalina
- name: Build MacOS DMG
env:
NOTARIZE: ${{ steps.check_secrets.outputs.HAS_APPLE_SECRET }}
APPLE_NOTARIZE_USERNAME: "${{ secrets.APPLE_NOTARIZE_USERNAME }}"