From 15e9c23fa0cbbaf5e8e2bd27f598135e9516e33b Mon Sep 17 00:00:00 2001 From: messense Date: Tue, 15 Mar 2022 20:47:39 +0800 Subject: [PATCH 1/2] Limit concurrency on GitHub Actions https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#concurrency --- .github/workflows/bench.yml | 4 ++++ .github/workflows/ci.yml | 4 ++++ .github/workflows/guide.yml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index d6d673f660c..162a26bd025 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -4,6 +4,10 @@ on: - main pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }} + cancel-in-progress: true + name: Benchmark jobs: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 224c7c02cd7..38807800253 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,6 +6,10 @@ on: - main pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }} + cancel-in-progress: true + env: CARGO_TERM_COLOR: always diff --git a/.github/workflows/guide.yml b/.github/workflows/guide.yml index d7566672f11..75216cdeb36 100644 --- a/.github/workflows/guide.yml +++ b/.github/workflows/guide.yml @@ -8,6 +8,10 @@ on: release: types: [published] +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }} + cancel-in-progress: true + env: CARGO_TERM_COLOR: always From ca5066f6d3211717d62abffeb3fce42785637554 Mon Sep 17 00:00:00 2001 From: messense Date: Tue, 15 Mar 2022 23:00:43 +0800 Subject: [PATCH 2/2] Test 32-bit Windows only with the latest Python version --- .github/workflows/ci.yml | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 38807800253..f0ed553e190 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -109,20 +109,7 @@ jobs: python-architecture: "x64", rust-target: "x86_64-pc-windows-msvc", }, - { - os: "windows-latest", - python-architecture: "x86", - rust-target: "i686-pc-windows-msvc", - }, ] - exclude: - # PyPy doesn't release 32-bit Windows builds any more - - python-version: pypy-3.7 - platform: { os: "windows-latest", python-architecture: "x86" } - - python-version: pypy-3.8 - platform: { os: "windows-latest", python-architecture: "x86" } - - python-version: pypy-3.9 - platform: { os: "windows-latest", python-architecture: "x86" } include: # Test minimal supported Rust version - rust: 1.48.0 @@ -145,6 +132,16 @@ jobs: rust-target: "x86_64-unknown-linux-gnu", } extra_features: "nightly" + + # Test 32-bit Windows only with the latest Python version + - rust: stable + python-version: "3.10" + platform: + { + os: "windows-latest", + python-architecture: "x86", + rust-target: "i686-pc-windows-msvc", + } steps: - uses: actions/checkout@v2