From f9e15febb77dfd5d1e721cff753bdf80e6c84c28 Mon Sep 17 00:00:00 2001 From: Daz DeBoer Date: Sun, 29 May 2022 12:13:55 -0600 Subject: [PATCH] Restrict quick-check workflow to ubuntu for faster feedback --- .github/workflows/ci-full-check.yml | 11 +++++++++++ .../integ-test-action-inputs-caching.yml | 14 ++++++++------ .github/workflows/integ-test-action-inputs.yml | 6 ++++-- .../integ-test-execution-with-caching.yml | 8 +++++--- .github/workflows/integ-test-execution.yml | 8 +++++--- .github/workflows/integ-test-gradle-versions.yml | 8 +++++--- .../integ-test-restore-configuration-cache.yml | 16 +++++++++------- .../integ-test-restore-custom-gradle-home.yml | 10 ++++++---- .../workflows/integ-test-restore-gradle-home.yml | 12 +++++++----- .../integ-test-restore-java-toolchain.yml | 8 +++++--- .../integ-test-sample-gradle-plugin.yml | 8 +++++--- .../workflows/integ-test-sample-kotlin-dsl.yml | 8 +++++--- 12 files changed, 75 insertions(+), 42 deletions(-) diff --git a/.github/workflows/ci-full-check.yml b/.github/workflows/ci-full-check.yml index 4754a6b..4334cf0 100644 --- a/.github/workflows/ci-full-check.yml +++ b/.github/workflows/ci-full-check.yml @@ -11,53 +11,64 @@ jobs: uses: ./.github/workflows/integ-test-action-inputs.yml with: cache-key-prefix: ${{github.run_number}}- + runner-os: '["ubuntu-latest", "windows-latest", "macos-latest"]' caching-config: uses: ./.github/workflows/integ-test-action-inputs-caching.yml with: cache-key-prefix: ${{github.run_number}}- + runner-os: '["ubuntu-latest", "windows-latest", "macos-latest"]' execution-with-caching: uses: ./.github/workflows/integ-test-execution-with-caching.yml with: cache-key-prefix: ${{github.run_number}}- + runner-os: '["ubuntu-latest", "windows-latest", "macos-latest"]' execution: uses: ./.github/workflows/integ-test-execution.yml with: cache-key-prefix: ${{github.run_number}}- + runner-os: '["ubuntu-latest", "windows-latest", "macos-latest"]' gradle-versions: uses: ./.github/workflows/integ-test-gradle-versions.yml with: cache-key-prefix: ${{github.run_number}}- + runner-os: '["ubuntu-latest", "windows-latest", "macos-latest"]' restore-configuration-cache: uses: ./.github/workflows/integ-test-restore-configuration-cache.yml with: cache-key-prefix: ${{github.run_number}}- + runner-os: '["ubuntu-latest", "windows-latest", "macos-latest"]' restore-custom-gradle-home: uses: ./.github/workflows/integ-test-restore-custom-gradle-home.yml with: cache-key-prefix: ${{github.run_number}}- + runner-os: '["ubuntu-latest", "windows-latest", "macos-latest"]' restore-gradle-home: uses: ./.github/workflows/integ-test-restore-gradle-home.yml with: cache-key-prefix: ${{github.run_number}}- + runner-os: '["ubuntu-latest", "windows-latest", "macos-latest"]' restore-java-toolchain: uses: ./.github/workflows/integ-test-restore-java-toolchain.yml with: cache-key-prefix: ${{github.run_number}}- + runner-os: '["ubuntu-latest", "windows-latest", "macos-latest"]' sample-kotlin-dsl: uses: ./.github/workflows/integ-test-sample-kotlin-dsl.yml with: cache-key-prefix: ${{github.run_number}}- + runner-os: '["ubuntu-latest", "windows-latest", "macos-latest"]' sample-gradle-plugin: uses: ./.github/workflows/integ-test-sample-gradle-plugin.yml with: cache-key-prefix: ${{github.run_number}}- + runner-os: '["ubuntu-latest", "windows-latest", "macos-latest"]' diff --git a/.github/workflows/integ-test-action-inputs-caching.yml b/.github/workflows/integ-test-action-inputs-caching.yml index b0bc57a..09e92c0 100644 --- a/.github/workflows/integ-test-action-inputs-caching.yml +++ b/.github/workflows/integ-test-action-inputs-caching.yml @@ -5,7 +5,9 @@ on: inputs: cache-key-prefix: type: string - workflow_dispatch: + runner-os: + type: string + default: '["ubuntu-latest"]' env: GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: action-inputs-caching-${{ inputs.cache-key-prefix }} @@ -15,7 +17,7 @@ jobs: seed-build: strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -39,7 +41,7 @@ jobs: needs: seed-build strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -62,7 +64,7 @@ jobs: cache-disabled: strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -109,7 +111,7 @@ jobs: GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{ inputs.cache-key-prefix }}-write-only- strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -128,7 +130,7 @@ jobs: needs: seed-build-write-only strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources diff --git a/.github/workflows/integ-test-action-inputs.yml b/.github/workflows/integ-test-action-inputs.yml index 0fd641f..6a7a957 100644 --- a/.github/workflows/integ-test-action-inputs.yml +++ b/.github/workflows/integ-test-action-inputs.yml @@ -5,7 +5,9 @@ on: inputs: cache-key-prefix: type: string - workflow_dispatch: + runner-os: + type: string + default: '["ubuntu-latest"]' env: GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: action-inputs-${{ inputs.cache-key-prefix }} @@ -15,7 +17,7 @@ jobs: action-inputs: strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources diff --git a/.github/workflows/integ-test-execution-with-caching.yml b/.github/workflows/integ-test-execution-with-caching.yml index 3627f43..22738e0 100644 --- a/.github/workflows/integ-test-execution-with-caching.yml +++ b/.github/workflows/integ-test-execution-with-caching.yml @@ -5,7 +5,9 @@ on: inputs: cache-key-prefix: type: string - workflow_dispatch: + runner-os: + type: string + default: '["ubuntu-latest"]' env: GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: execution-with-caching-${{ inputs.cache-key-prefix }} @@ -15,7 +17,7 @@ jobs: seed-build: strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -31,7 +33,7 @@ jobs: needs: seed-build strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources diff --git a/.github/workflows/integ-test-execution.yml b/.github/workflows/integ-test-execution.yml index 4af4d42..d03ffb8 100644 --- a/.github/workflows/integ-test-execution.yml +++ b/.github/workflows/integ-test-execution.yml @@ -5,7 +5,9 @@ on: inputs: cache-key-prefix: type: string - workflow_dispatch: + runner-os: + type: string + default: '["ubuntu-latest"]' env: GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: execution-${{ inputs.cache-key-prefix }} @@ -17,7 +19,7 @@ jobs: gradle-execution: strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} include: - os: windows-latest script-suffix: '.bat' @@ -48,7 +50,7 @@ jobs: strategy: matrix: gradle: [7.3, 6.9, 5.6.4, 4.10.3] - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} include: - gradle: 5.6.4 build-root-suffix: -gradle-5 diff --git a/.github/workflows/integ-test-gradle-versions.yml b/.github/workflows/integ-test-gradle-versions.yml index 044f760..d04dfe8 100644 --- a/.github/workflows/integ-test-gradle-versions.yml +++ b/.github/workflows/integ-test-gradle-versions.yml @@ -5,7 +5,9 @@ on: inputs: cache-key-prefix: type: string - workflow_dispatch: + runner-os: + type: string + default: '["ubuntu-latest"]' env: GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: gradle-versions-${{ inputs.cache-key-prefix }} @@ -17,7 +19,7 @@ jobs: provision-gradle: strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} include: - os: windows-latest script-suffix: '.bat' @@ -51,7 +53,7 @@ jobs: strategy: matrix: gradle: [7.3, 6.9, 5.6.4, 4.10.3] - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} include: - gradle: 5.6.4 build-root-suffix: -gradle-5 diff --git a/.github/workflows/integ-test-restore-configuration-cache.yml b/.github/workflows/integ-test-restore-configuration-cache.yml index 8f722ba..b966c18 100644 --- a/.github/workflows/integ-test-restore-configuration-cache.yml +++ b/.github/workflows/integ-test-restore-configuration-cache.yml @@ -5,7 +5,9 @@ on: inputs: cache-key-prefix: type: string - workflow_dispatch: + runner-os: + type: string + default: '["ubuntu-latest"]' env: GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: restore-configuration-cache-${{ inputs.cache-key-prefix }} @@ -17,7 +19,7 @@ jobs: GRADLE_BUILD_ACTION_CACHE_KEY_JOB: build-groovy strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -34,7 +36,7 @@ jobs: needs: seed-build-groovy strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -61,7 +63,7 @@ jobs: needs: seed-build-groovy strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -81,7 +83,7 @@ jobs: GRADLE_BUILD_ACTION_CACHE_KEY_JOB: build-kotlin strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -98,7 +100,7 @@ jobs: needs: seed-build-kotlin strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -116,7 +118,7 @@ jobs: needs: modify-build-kotlin strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources diff --git a/.github/workflows/integ-test-restore-custom-gradle-home.yml b/.github/workflows/integ-test-restore-custom-gradle-home.yml index c633166..06dcdc5 100644 --- a/.github/workflows/integ-test-restore-custom-gradle-home.yml +++ b/.github/workflows/integ-test-restore-custom-gradle-home.yml @@ -5,7 +5,9 @@ on: inputs: cache-key-prefix: type: string - workflow_dispatch: + runner-os: + type: string + default: '["ubuntu-latest"]' env: GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: restore-custom-gradle-home-${{ inputs.cache-key-prefix }} @@ -15,7 +17,7 @@ jobs: seed-build: strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -31,7 +33,7 @@ jobs: needs: seed-build strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -49,7 +51,7 @@ jobs: needs: seed-build strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources diff --git a/.github/workflows/integ-test-restore-gradle-home.yml b/.github/workflows/integ-test-restore-gradle-home.yml index 0f2cb9a..6801ed6 100644 --- a/.github/workflows/integ-test-restore-gradle-home.yml +++ b/.github/workflows/integ-test-restore-gradle-home.yml @@ -5,7 +5,9 @@ on: inputs: cache-key-prefix: type: string - workflow_dispatch: + runner-os: + type: string + default: '["ubuntu-latest"]' env: GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: restore-gradle-home-${{ inputs.cache-key-prefix }} @@ -16,7 +18,7 @@ jobs: seed-build: strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -32,7 +34,7 @@ jobs: needs: seed-build strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -50,7 +52,7 @@ jobs: needs: seed-build strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -68,7 +70,7 @@ jobs: needs: seed-build strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources diff --git a/.github/workflows/integ-test-restore-java-toolchain.yml b/.github/workflows/integ-test-restore-java-toolchain.yml index ff52382..28c209c 100644 --- a/.github/workflows/integ-test-restore-java-toolchain.yml +++ b/.github/workflows/integ-test-restore-java-toolchain.yml @@ -5,7 +5,9 @@ on: inputs: cache-key-prefix: type: string - workflow_dispatch: + runner-os: + type: string + default: '["ubuntu-latest"]' env: GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: restore-java-toolchain-${{ inputs.cache-key-prefix }} @@ -15,7 +17,7 @@ jobs: seed-build: strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -31,7 +33,7 @@ jobs: needs: seed-build strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources diff --git a/.github/workflows/integ-test-sample-gradle-plugin.yml b/.github/workflows/integ-test-sample-gradle-plugin.yml index 80805f1..d19f459 100644 --- a/.github/workflows/integ-test-sample-gradle-plugin.yml +++ b/.github/workflows/integ-test-sample-gradle-plugin.yml @@ -5,7 +5,9 @@ on: inputs: cache-key-prefix: type: string - workflow_dispatch: + runner-os: + type: string + default: '["ubuntu-latest"]' env: GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: sample-gradle-plugin-${{ inputs.cache-key-prefix }} @@ -15,7 +17,7 @@ jobs: seed-build: strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -30,7 +32,7 @@ jobs: needs: seed-build strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources diff --git a/.github/workflows/integ-test-sample-kotlin-dsl.yml b/.github/workflows/integ-test-sample-kotlin-dsl.yml index 02fee9f..3fab646 100644 --- a/.github/workflows/integ-test-sample-kotlin-dsl.yml +++ b/.github/workflows/integ-test-sample-kotlin-dsl.yml @@ -5,7 +5,9 @@ on: inputs: cache-key-prefix: type: string - workflow_dispatch: + runner-os: + type: string + default: '["ubuntu-latest"]' env: GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: sample-kotlin-dsl-${{ inputs.cache-key-prefix }} @@ -15,7 +17,7 @@ jobs: seed-build: strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -30,7 +32,7 @@ jobs: needs: seed-build strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ${{fromJSON(inputs.runner-os)}} runs-on: ${{ matrix.os }} steps: - name: Checkout sources