From 64869b1757af1e600a9ae8052c18394352a06cb6 Mon Sep 17 00:00:00 2001 From: daz Date: Wed, 7 Aug 2024 08:13:13 -0600 Subject: [PATCH] Attempt to reduce contention in integ-test-full --- .github/workflows/integ-test-cache-cleanup.yml | 3 +++ .../workflows/integ-test-caching-config.yml | 5 +++++ .../workflows/integ-test-dependency-graph.yml | 18 +++--------------- .../integ-test-dependency-submission.yml | 7 +++++++ .../integ-test-provision-gradle-versions.yml | 1 + .../integ-test-restore-configuration-cache.yml | 7 +++++++ .../integ-test-restore-gradle-home.yml | 5 +++++ .../integ-test-restore-java-toolchain.yml | 2 ++ .../integ-test-sample-gradle-plugin.yml | 2 ++ .../workflows/integ-test-sample-kotlin-dsl.yml | 2 ++ 10 files changed, 37 insertions(+), 15 deletions(-) diff --git a/.github/workflows/integ-test-cache-cleanup.yml b/.github/workflows/integ-test-cache-cleanup.yml index 46e58f7..5916c1a 100644 --- a/.github/workflows/integ-test-cache-cleanup.yml +++ b/.github/workflows/integ-test-cache-cleanup.yml @@ -21,6 +21,7 @@ env: jobs: cache-cleanup-full-build: strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -43,6 +44,7 @@ jobs: cache-cleanup-assemble-build: needs: cache-cleanup-full-build strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -65,6 +67,7 @@ jobs: cache-cleanup-check-clean-cache: needs: cache-cleanup-assemble-build strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} diff --git a/.github/workflows/integ-test-caching-config.yml b/.github/workflows/integ-test-caching-config.yml index d30c5ac..1653ec9 100644 --- a/.github/workflows/integ-test-caching-config.yml +++ b/.github/workflows/integ-test-caching-config.yml @@ -20,6 +20,7 @@ env: jobs: caching-config-seed-build: strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -50,6 +51,7 @@ jobs: caching-config-verify-build: needs: caching-config-seed-build strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -78,6 +80,7 @@ jobs: # Test that build scans are captured when caching is explicitly disabled caching-config-cache-disabled: strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -132,6 +135,7 @@ jobs: env: GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: caching-config-write-only-${{ inputs.cache-key-prefix }} strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -155,6 +159,7 @@ jobs: GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: caching-config-write-only-${{ inputs.cache-key-prefix }} needs: caching-config-seed-write-only strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} diff --git a/.github/workflows/integ-test-dependency-graph.yml b/.github/workflows/integ-test-dependency-graph.yml index 90b25fc..efbbca6 100644 --- a/.github/workflows/integ-test-dependency-graph.yml +++ b/.github/workflows/integ-test-dependency-graph.yml @@ -23,11 +23,7 @@ env: jobs: dependency-graph-groovy-upload: - strategy: - fail-fast: false - matrix: - os: ${{fromJSON(inputs.runner-os)}} - runs-on: ${{ matrix.os }} + runs-on: "ubuntu-latest" steps: - name: Checkout sources uses: actions/checkout@v4 @@ -59,11 +55,7 @@ jobs: DEPENDENCY_GRAPH_DOWNLOAD_ARTIFACT_NAME: groovy-upload dependency-graph-kotlin-generate-and-submit: - strategy: - fail-fast: false - matrix: - os: ${{fromJSON(inputs.runner-os)}} - runs-on: ${{ matrix.os }} + runs-on: "ubuntu-latest" steps: - name: Checkout sources uses: actions/checkout@v4 @@ -79,11 +71,7 @@ jobs: working-directory: .github/workflow-samples/kotlin-dsl dependency-graph-multiple-builds: - strategy: - fail-fast: false - matrix: - os: ${{fromJSON(inputs.runner-os)}} - runs-on: ${{ matrix.os }} + runs-on: "ubuntu-latest" steps: - name: Checkout sources uses: actions/checkout@v4 diff --git a/.github/workflows/integ-test-dependency-submission.yml b/.github/workflows/integ-test-dependency-submission.yml index c486983..36ecf73 100644 --- a/.github/workflows/integ-test-dependency-submission.yml +++ b/.github/workflows/integ-test-dependency-submission.yml @@ -24,6 +24,7 @@ env: jobs: dependency-submission-groovy-generate-and-upload: strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -46,6 +47,7 @@ jobs: dependency-submission-groovy-restore-cache: needs: [dependency-submission-groovy-generate-and-upload] strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -67,6 +69,7 @@ jobs: dependency-submission-groovy-download-and-submit: needs: [dependency-submission-groovy-generate-and-upload] strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -86,6 +89,7 @@ jobs: dependency-submission-kotlin-generate-and-submit: strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -103,6 +107,7 @@ jobs: dependency-submission-multiple-builds: strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -148,6 +153,7 @@ jobs: dependency-submission-multiple-builds-upload: strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -299,6 +305,7 @@ jobs: dependency-submission-custom-report-dir-submit: strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} diff --git a/.github/workflows/integ-test-provision-gradle-versions.yml b/.github/workflows/integ-test-provision-gradle-versions.yml index b27e2d7..2fe4d36 100644 --- a/.github/workflows/integ-test-provision-gradle-versions.yml +++ b/.github/workflows/integ-test-provision-gradle-versions.yml @@ -23,6 +23,7 @@ jobs: # Each build verifies that it is executed with the expected Gradle version. provision-gradle: strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} diff --git a/.github/workflows/integ-test-restore-configuration-cache.yml b/.github/workflows/integ-test-restore-configuration-cache.yml index 74f9e20..facab62 100644 --- a/.github/workflows/integ-test-restore-configuration-cache.yml +++ b/.github/workflows/integ-test-restore-configuration-cache.yml @@ -25,6 +25,7 @@ jobs: env: GRADLE_BUILD_ACTION_CACHE_KEY_JOB: restore-cc-groovy strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -57,6 +58,7 @@ jobs: GRADLE_BUILD_ACTION_CACHE_KEY_JOB_EXECUTION: ${{github.sha}}_1 needs: restore-cc-seed-build-groovy strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -98,6 +100,7 @@ jobs: GRADLE_BUILD_ACTION_CACHE_KEY_JOB_EXECUTION: ${{github.sha}}_2 needs: restore-cc-verify-build-groovy strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -138,6 +141,7 @@ jobs: GRADLE_BUILD_ACTION_CACHE_KEY_JOB_EXECUTION: ${{github.sha}}_x needs: restore-cc-seed-build-groovy strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -169,6 +173,7 @@ jobs: env: GRADLE_BUILD_ACTION_CACHE_KEY_JOB: restore-cc-kotlin strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -201,6 +206,7 @@ jobs: GRADLE_BUILD_ACTION_CACHE_KEY_JOB_EXECUTION: ${{github.sha}}_1 needs: restore-cc-seed-build-kotlin strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -233,6 +239,7 @@ jobs: GRADLE_BUILD_ACTION_CACHE_KEY_JOB_EXECUTION: ${{github.sha}}_2 needs: restore-cc-modify-build-kotlin strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} diff --git a/.github/workflows/integ-test-restore-gradle-home.yml b/.github/workflows/integ-test-restore-gradle-home.yml index 345e237..5ebe70f 100644 --- a/.github/workflows/integ-test-restore-gradle-home.yml +++ b/.github/workflows/integ-test-restore-gradle-home.yml @@ -21,6 +21,7 @@ env: jobs: restore-gradle-home-seed-build: strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -43,6 +44,7 @@ jobs: restore-gradle-home-dependencies-cache: needs: restore-gradle-home-seed-build strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -65,6 +67,7 @@ jobs: restore-gradle-home-build-cache: needs: restore-gradle-home-seed-build strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -87,6 +90,7 @@ jobs: restore-gradle-home-no-extracted-cache-entries-restored: needs: restore-gradle-home-seed-build strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -111,6 +115,7 @@ jobs: restore-gradle-home-pre-existing-gradle-home: needs: restore-gradle-home-seed-build strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} diff --git a/.github/workflows/integ-test-restore-java-toolchain.yml b/.github/workflows/integ-test-restore-java-toolchain.yml index 847f1b8..bda00cc 100644 --- a/.github/workflows/integ-test-restore-java-toolchain.yml +++ b/.github/workflows/integ-test-restore-java-toolchain.yml @@ -20,6 +20,7 @@ env: jobs: restore-java-toolchain-seed-build: strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -42,6 +43,7 @@ jobs: restore-java-toolchain-verify-build: needs: restore-java-toolchain-seed-build strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} diff --git a/.github/workflows/integ-test-sample-gradle-plugin.yml b/.github/workflows/integ-test-sample-gradle-plugin.yml index 1b01534..8c5d3fe 100644 --- a/.github/workflows/integ-test-sample-gradle-plugin.yml +++ b/.github/workflows/integ-test-sample-gradle-plugin.yml @@ -20,6 +20,7 @@ env: jobs: sample-gradle-plugin-seed-build: strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -41,6 +42,7 @@ jobs: sample-gradle-plugin-verify-build: needs: sample-gradle-plugin-seed-build strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} diff --git a/.github/workflows/integ-test-sample-kotlin-dsl.yml b/.github/workflows/integ-test-sample-kotlin-dsl.yml index 1922e5a..4fae2a3 100644 --- a/.github/workflows/integ-test-sample-kotlin-dsl.yml +++ b/.github/workflows/integ-test-sample-kotlin-dsl.yml @@ -20,6 +20,7 @@ env: jobs: sample-kotlin-dsl-seed-build: strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}} @@ -41,6 +42,7 @@ jobs: sample-kotlin-dsl-verify-build: needs: sample-kotlin-dsl-seed-build strategy: + max-parallel: 1 fail-fast: false matrix: os: ${{fromJSON(inputs.runner-os)}}