From d2c9b5193a1d9ac3fd3b1256029a3150ca27c1c4 Mon Sep 17 00:00:00 2001 From: Brandon Butler Date: Thu, 17 Aug 2023 11:49:01 -0700 Subject: [PATCH] Remove all arch -arm64 from commands in m1 wheel workflow --- .github/workflows/build-m1-wheel.yml | 36 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build-m1-wheel.yml b/.github/workflows/build-m1-wheel.yml index 6883d071..142d6941 100644 --- a/.github/workflows/build-m1-wheel.yml +++ b/.github/workflows/build-m1-wheel.yml @@ -37,56 +37,56 @@ jobs: - name: Set up rust run: | curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rust.sh - arch -arm64 sh rust.sh -y + sh rust.sh -y - name: Build m1 wheels run: | - arch -arm64 python3 -m venv venv + python3 -m venv venv . ./venv/bin/activate export PATH=~/.cargo/bin:$PATH - arch -arm64 pip install maturin - arch -arm64 maturin build -m wheel/Cargo.toml -i python --release --strip --features=openssl + pip install maturin + maturin build -m wheel/Cargo.toml -i python --release --strip --features=openssl - name: Install clvm_rs wheel run: | . ./venv/bin/activate ls ./target/wheels/ - arch -arm64 pip install ./target/wheels/clvm_rs*.whl + pip install ./target/wheels/clvm_rs*.whl - name: Install other wheels run: | . ./venv/bin/activate - arch -arm64 python -m pip install pytest - arch -arm64 python -m pip install blspy + python -m pip install pytest + python -m pip install blspy - name: install clvm & clvm_tools run: | . ./venv/bin/activate - arch -arm64 git clone https://github.com/Chia-Network/clvm.git --branch=main --single-branch - arch -arm64 python -m pip install ./clvm + git clone https://github.com/Chia-Network/clvm.git --branch=main --single-branch + python -m pip install ./clvm - arch -arm64 git clone https://github.com/Chia-Network/clvm_tools.git --branch=main --single-branch - arch -arm64 python -m pip install ./clvm_tools + git clone https://github.com/Chia-Network/clvm_tools.git --branch=main --single-branch + python -m pip install ./clvm_tools - name: Ensure clvm, clvm_rs, clvm_tools are installed run: | . ./venv/bin/activate - arch -arm64 python -c 'import clvm' - arch -arm64 python -c 'import clvm; print(clvm.__file__)' - arch -arm64 python -c 'import clvm_rs; print(clvm_rs.__file__)' - arch -arm64 python -c 'import clvm_tools; print(clvm_tools.__file__)' + python -c 'import clvm' + python -c 'import clvm; print(clvm.__file__)' + python -c 'import clvm_rs; print(clvm_rs.__file__)' + python -c 'import clvm_tools; print(clvm_tools.__file__)' - name: Run tests from clvm run: | . ./venv/bin/activate cd clvm - arch -arm64 pytest tests + pytest tests - name: Run tests from clvm_tools run: | . ./venv/bin/activate cd clvm_tools - arch -arm64 pytest tests + pytest tests - name: Run tests from wheel run: | @@ -106,7 +106,7 @@ jobs: - name: Install twine run: | . ./venv/bin/activate - arch -arm64 pip install twine + pip install twine - name: Publish distribution to PyPI if: startsWith(github.event.ref, 'refs/tags')