From b5b9cfe2aaf2773525bae01a515c1243f3d7cad1 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Sat, 15 Jan 2022 11:22:31 -0500 Subject: [PATCH] Update build.yml --- .github/workflows/build.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0b40f666..2064f9bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,11 +69,11 @@ jobs: jid: 8 gamos: linux platform: x86_64 - - os: [self-hosted, linux, arm64] - jid: 9 - goal: "self-build" - platform: "aarch64" - gamos: linux + #- os: [self-hosted, linux, arm64] + # jid: 9 + # goal: "self-build" + # platform: "aarch64" + # gamos: linux - os: [self-hosted, linux, arm] jid: 10 goal: "self-build" @@ -94,7 +94,7 @@ jobs: path: | ~/python ~/ssl - key: ${{ matrix.os }}-${{ matrix.jid }}-20220111-03 + key: ${{ matrix.os }}-${{ matrix.jid }}-20220115 - name: Set env variables env: @@ -145,7 +145,7 @@ jobs: sudo apt-get -qq --yes install swig libpcsclite-dev - name: Set env variables for pre-compiled Python - if: matrix.goal != 'build' + if: matrix.goal == 'test' run: | export python=$(which python3) export pip=$(which pip3) @@ -161,7 +161,7 @@ jobs: "${pip}" -V - name: Build and install Python and OpenSSL - if: matrix.goal == 'build' && steps.cache-primes.outputs.cache-hit != 'true' + if: (matrix.goal == 'build' || matrix.goal == 'self-build') && steps.cache-primes.outputs.cache-hit != 'true' run: | set +e source ../.github/actions/${GAMOS}-before-install.sh @@ -233,7 +233,7 @@ jobs: $pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 $pip install -U --force-reinstall $pipoptions $pip install --upgrade -r requirements.txt $pipoptions # yubikey-manager holds cryptography to old version, force upgrade - $pip install --upgrade --no-deps cryptography $pipoptions + # $pip install --upgrade --no-deps cryptography $pipoptions - name: Build GAM with PyInstaller if: matrix.goal != 'test'