From 3a3baa7dd94a4f686e90ccfe91321aa00d4c538a Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Tue, 21 Apr 2020 16:39:19 -0500 Subject: [PATCH 1/2] chore: remove config/emitter cargo aliases --- .cargo/config | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.cargo/config b/.cargo/config index 38828f1cb6e..b6df9194d4b 100644 --- a/.cargo/config +++ b/.cargo/config @@ -6,12 +6,6 @@ test-all = "test --manifest-path rustfmt-core/Cargo.toml" test-bin = "test --manifest-path rustfmt-core/rustfmt-bin/Cargo.toml" tb = "test-bin" -test-config = "test --manifest-path rustfmt-core/rustfmt-config/Cargo.toml" -tc = "test-config" - -test-emitter = "test --manifest-path rustfmt-core/rustfmt-emitter/Cargo.toml" -te = "test-emitter" - test-lib = "test --manifest-path rustfmt-core/rustfmt-lib/Cargo.toml" tl = "test-lib" From 16bca7935a1769b0b499adaa22e8ae7f2592d752 Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Tue, 21 Apr 2020 16:46:06 -0500 Subject: [PATCH 2/2] ci: add max-parallel config to workflows --- .github/workflows/integration.yml | 5 +++++ .github/workflows/linux.yml | 5 +++++ .github/workflows/windows.yml | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index ba994110d24..7edaee34b45 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -6,6 +6,11 @@ jobs: runs-on: ubuntu-latest name: ${{ matrix.integration }} strategy: + # https://help.github.com/en/actions/getting-started-with-github-actions/about-github-actions#usage-limits + # There's a limit of 60 concurrent jobs across all repos in the rust-lang organization. + # In order to prevent overusing too much of that 60 limit, we throttle the + # number of rustfmt jobs that will run concurrently. + max-parallel: 4 fail-fast: false matrix: integration: [ diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 8a27dac4fc6..33894dd0c87 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -6,6 +6,11 @@ jobs: runs-on: ubuntu-latest name: (${{ matrix.target }}, ${{ matrix.channel }}, ${{ matrix.cfg-release-channel }}) strategy: + # https://help.github.com/en/actions/getting-started-with-github-actions/about-github-actions#usage-limits + # There's a limit of 60 concurrent jobs across all repos in the rust-lang organization. + # In order to prevent overusing too much of that 60 limit, we throttle the + # number of rustfmt jobs that will run concurrently. + max-parallel: 1 fail-fast: false matrix: target: [ diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 463377d3a12..3385f4463be 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -6,6 +6,11 @@ jobs: runs-on: windows-latest name: (${{ matrix.target }}, ${{ matrix.channel }}) strategy: + # https://help.github.com/en/actions/getting-started-with-github-actions/about-github-actions#usage-limits + # There's a limit of 60 concurrent jobs across all repos in the rust-lang organization. + # In order to prevent overusing too much of that 60 limit, we throttle the + # number of rustfmt jobs that will run concurrently. + max-parallel: 1 fail-fast: false matrix: target: [