From cba1833ddecbbee649950c284416981928631008 Mon Sep 17 00:00:00 2001 From: Daz DeBoer Date: Thu, 21 Oct 2021 12:08:17 -0600 Subject: [PATCH] Run test builds on Ubuntu and Windows - Remove MacOS since the agents are current flaky - Add Windows to a few more test pipelines --- .github/workflows/integTest-action-inputs.yml | 5 ++++- .github/workflows/integTest-caching-config.yml | 4 ++-- .github/workflows/integTest-caching.yml | 13 ++++++++----- .github/workflows/integTest-execution.yml | 4 ++-- .github/workflows/integTest-gradle-user-home.yml | 15 ++++++++++++--- .github/workflows/integTest-kotlin-dsl.yml | 10 ++++++++-- 6 files changed, 36 insertions(+), 15 deletions(-) diff --git a/.github/workflows/integTest-action-inputs.yml b/.github/workflows/integTest-action-inputs.yml index 9e75822..bea6845 100644 --- a/.github/workflows/integTest-action-inputs.yml +++ b/.github/workflows/integTest-action-inputs.yml @@ -10,7 +10,10 @@ env: jobs: action-inputs: - runs-on: ubuntu-latest + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + runs-on: ${{ matrix.os }} steps: - name: Checkout sources uses: actions/checkout@v2 diff --git a/.github/workflows/integTest-caching-config.yml b/.github/workflows/integTest-caching-config.yml index 62fdab7..7ffd2e4 100644 --- a/.github/workflows/integTest-caching-config.yml +++ b/.github/workflows/integTest-caching-config.yml @@ -15,7 +15,7 @@ jobs: seed-build: strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -44,7 +44,7 @@ jobs: needs: seed-build strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} steps: - name: Checkout sources diff --git a/.github/workflows/integTest-caching.yml b/.github/workflows/integTest-caching.yml index f8eb7ea..2961566 100644 --- a/.github/workflows/integTest-caching.yml +++ b/.github/workflows/integTest-caching.yml @@ -14,7 +14,7 @@ jobs: seed-build: strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -35,7 +35,7 @@ jobs: needs: seed-build strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -52,7 +52,7 @@ jobs: needs: seed-build strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -69,7 +69,7 @@ jobs: needs: seed-build strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -86,7 +86,10 @@ jobs: # Check that the build can run when no bundles are restored no-bundles-restored: needs: seed-build - runs-on: ubuntu-latest + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + runs-on: ${{ matrix.os }} steps: - name: Checkout sources uses: actions/checkout@v2 diff --git a/.github/workflows/integTest-execution.yml b/.github/workflows/integTest-execution.yml index 7723502..2a9f824 100644 --- a/.github/workflows/integTest-execution.yml +++ b/.github/workflows/integTest-execution.yml @@ -14,7 +14,7 @@ jobs: gradle-execution: strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, windows-latest] include: - os: windows-latest script-suffix: '.bat' @@ -44,7 +44,7 @@ jobs: gradle-versions: strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, windows-latest] include: - os: windows-latest script-suffix: '.bat' diff --git a/.github/workflows/integTest-gradle-user-home.yml b/.github/workflows/integTest-gradle-user-home.yml index e04e6f1..53543c7 100644 --- a/.github/workflows/integTest-gradle-user-home.yml +++ b/.github/workflows/integTest-gradle-user-home.yml @@ -13,7 +13,10 @@ jobs: # Run initial Gradle builds to push initial cache entries # These builds should start fresh without cache hits, due to the seed injected into the cache key above. seed-build: - runs-on: ubuntu-latest + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + runs-on: ${{ matrix.os }} steps: - name: Checkout sources uses: actions/checkout@v2 @@ -26,7 +29,10 @@ jobs: # Test that the gradle-user-home cache will cache dependencies, by running build with --offline dependencies-cache: needs: seed-build - runs-on: ubuntu-latest + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + runs-on: ${{ matrix.os }} steps: - name: Checkout sources uses: actions/checkout@v2 @@ -40,7 +46,10 @@ jobs: # Test that the gradle-user-home cache will cache and restore local build-cache build-cache: needs: seed-build - runs-on: ubuntu-latest + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + runs-on: ${{ matrix.os }} steps: - name: Checkout sources uses: actions/checkout@v2 diff --git a/.github/workflows/integTest-kotlin-dsl.yml b/.github/workflows/integTest-kotlin-dsl.yml index 0dba943..863ba78 100644 --- a/.github/workflows/integTest-kotlin-dsl.yml +++ b/.github/workflows/integTest-kotlin-dsl.yml @@ -12,7 +12,10 @@ env: jobs: # Use kotlin-dsl project to verify caching of generated jars and compiled scripts seed-build: - runs-on: ubuntu-latest + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + runs-on: ${{ matrix.os }} steps: - name: Checkout sources uses: actions/checkout@v2 @@ -25,7 +28,10 @@ jobs: # Check that the build can run --offline verify-build: needs: seed-build - runs-on: ubuntu-latest + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + runs-on: ${{ matrix.os }} steps: - name: Checkout sources uses: actions/checkout@v2