From f6258fe7fb4820437e3f753bdbfb87975e712d64 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Tue, 24 Sep 2024 10:22:30 -0400 Subject: [PATCH 1/3] defaults: run: shell: bash --- .github/workflows/audit-check.yml | 4 ++++ .github/workflows/benchmark.yml | 4 ++++ .github/workflows/build-crate.yml | 4 ++++ .github/workflows/build-npm.yml | 4 ++++ .github/workflows/build-riscv64.yml | 8 ++++---- .github/workflows/build-wheels.yml | 4 ++++ .github/workflows/check-commit-signing.yml | 4 ++++ 7 files changed, 28 insertions(+), 4 deletions(-) diff --git a/.github/workflows/audit-check.yml b/.github/workflows/audit-check.yml index 332799198..100f7f20d 100644 --- a/.github/workflows/audit-check.yml +++ b/.github/workflows/audit-check.yml @@ -4,6 +4,10 @@ on: branches: - "**" +defaults: + run: + shell: bash + jobs: security_audit: runs-on: ubuntu-latest diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index cf1ad22fd..24fd5a353 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -10,6 +10,10 @@ on: branches: - "**" +defaults: + run: + shell: bash + jobs: tests: name: Unit Tests diff --git a/.github/workflows/build-crate.yml b/.github/workflows/build-crate.yml index 746095a69..4324374f5 100644 --- a/.github/workflows/build-crate.yml +++ b/.github/workflows/build-crate.yml @@ -10,6 +10,10 @@ on: branches: - "**" +defaults: + run: + shell: bash + jobs: build_crate: name: Build crate diff --git a/.github/workflows/build-npm.yml b/.github/workflows/build-npm.yml index 4679bd3c8..511902ced 100644 --- a/.github/workflows/build-npm.yml +++ b/.github/workflows/build-npm.yml @@ -10,6 +10,10 @@ on: branches: - "**" +defaults: + run: + shell: bash + jobs: build_npm: name: Build npm diff --git a/.github/workflows/build-riscv64.yml b/.github/workflows/build-riscv64.yml index 4099724be..5703d212a 100644 --- a/.github/workflows/build-riscv64.yml +++ b/.github/workflows/build-riscv64.yml @@ -10,6 +10,10 @@ on: branches: - "**" +defaults: + run: + shell: bash + permissions: id-token: write contents: read @@ -124,7 +128,6 @@ jobs: - name: List existing wheels if: env.RELEASE == 'true' - shell: sh run: | aws s3 ls s3://download.chia.net/simple/chia-rs/ > existing_wheel_list_raw cat existing_wheel_list_raw @@ -132,20 +135,17 @@ jobs: - name: List new wheels if: env.RELEASE == 'true' - shell: sh run: | (cd target/wheels/; ls chia_rs-*.whl) > new_wheel_list cat new_wheel_list | xargs -I % sh -c 'ls -l target/wheels/%' - name: Choose wheels to upload if: env.RELEASE == 'true' - shell: sh run: | grep -F -x -v -f existing_wheel_list new_wheel_list > upload_wheel_list cat upload_wheel_list - name: Upload wheels if: env.RELEASE == 'true' - shell: sh run: | cat upload_wheel_list | xargs -I % sh -c 'aws s3 cp target/wheels/% s3://download.chia.net/simple/chia-rs/' diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index f2d95d961..ae9fb8a92 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -15,6 +15,10 @@ concurrency: group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }} cancel-in-progress: true +defaults: + run: + shell: bash + permissions: id-token: write contents: read diff --git a/.github/workflows/check-commit-signing.yml b/.github/workflows/check-commit-signing.yml index fa34811a6..82bef4bac 100644 --- a/.github/workflows/check-commit-signing.yml +++ b/.github/workflows/check-commit-signing.yml @@ -14,6 +14,10 @@ concurrency: group: ${{ github.event_name == 'pull_request' && format('{0}-{1}', github.workflow_ref, github.event.pull_request.number) || github.run_id }} cancel-in-progress: true +defaults: + run: + shell: bash + jobs: check-commit-signing: name: Check commit signing From fe0982b85110efd1d1d06ab6f270a83dad528fa8 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Tue, 24 Sep 2024 10:25:28 -0400 Subject: [PATCH 2/3] correct slashes --- .github/workflows/build-wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index ae9fb8a92..9664cae36 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -183,7 +183,7 @@ jobs: CFLAGS: "-D__BLST_PORTABLE__" run: | py -${{ matrix.python.major-dot-minor }} -m venv venv - . .\venv\Scripts\Activate.ps1 + . ./venv/Scripts/activate maturin build -i python --release -m wheel/Cargo.toml - uses: Chia-Network/actions/create-venv@main From 5d72a644e0d6fbc7c7cf61a9a3499ef4ba85d57e Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Tue, 24 Sep 2024 10:32:32 -0400 Subject: [PATCH 3/3] undo --- .github/workflows/check-commit-signing.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/check-commit-signing.yml b/.github/workflows/check-commit-signing.yml index 82bef4bac..fa34811a6 100644 --- a/.github/workflows/check-commit-signing.yml +++ b/.github/workflows/check-commit-signing.yml @@ -14,10 +14,6 @@ concurrency: group: ${{ github.event_name == 'pull_request' && format('{0}-{1}', github.workflow_ref, github.event.pull_request.number) || github.run_id }} cancel-in-progress: true -defaults: - run: - shell: bash - jobs: check-commit-signing: name: Check commit signing