From d4d4b1d7c792d39130a4e14d55930d4cf63a3793 Mon Sep 17 00:00:00 2001 From: Eric Haag Date: Thu, 25 Jul 2024 11:08:38 -0500 Subject: [PATCH 1/4] Update version matrix in verification workflows --- ...oss-platform-testing-build-from-source.yml | 23 +++++++++++-------- ...atform-testing-use-development-release.yml | 23 +++++++++++-------- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/.github/workflows/cross-platform-testing-build-from-source.yml b/.github/workflows/cross-platform-testing-build-from-source.yml index 099ef1ee..a82eacbe 100644 --- a/.github/workflows/cross-platform-testing-build-from-source.yml +++ b/.github/workflows/cross-platform-testing-build-from-source.yml @@ -35,18 +35,23 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, windows-2019] - java-version: [ '8', '11', '17' ] + # Only the latest available version of each OS is tested + # Both macOS 13 and 14 are tested because they use different architectures + os: + - ubuntu-24.04 + - macos-13 # x86_64 + - macos-14 # aarch64 + - windows-2022 + # Only LTS versions greater than 8 are tested + java-version: [ '8', '11', '17', '21' ] include: - - os: ubuntu-20.04 + - os: ubuntu-24.04 shell: bash - - os: ubuntu-22.04 + - os: macos-13 shell: bash - - os: macos-11 + - os: macos-14 shell: bash - - os: macos-12 - shell: bash - - os: windows-2019 + - os: windows-2022 shell: wsl-bash defaults: run: @@ -73,7 +78,7 @@ jobs: uses: actions/setup-java@v4 with: java-version: ${{ matrix.java-version }} - distribution: 'temurin' + distribution: ${{ matrix.os == 'macos-14' && 'zulu' || 'temurin' }} # No Temurin JDK 8 distribution for aarch64 - name: Download built script artifacts uses: actions/download-artifact@v4 with: diff --git a/.github/workflows/cross-platform-testing-use-development-release.yml b/.github/workflows/cross-platform-testing-use-development-release.yml index cc1d13e6..c5ad9bd7 100644 --- a/.github/workflows/cross-platform-testing-use-development-release.yml +++ b/.github/workflows/cross-platform-testing-use-development-release.yml @@ -14,18 +14,23 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, windows-2019] - java-version: [ '8', '11', '17' ] + # Only the latest available version of each OS is tested + # Both macOS 13 and 14 are tested because they use different architectures + os: + - ubuntu-24.04 + - macos-13 # x86_64 + - macos-14 # aarch64 + - windows-2022 + # Only LTS versions greater than 8 are tested + java-version: [ '8', '11', '17', '21' ] include: - - os: ubuntu-20.04 + - os: ubuntu-24.04 shell: bash - - os: ubuntu-22.04 + - os: macos-13 shell: bash - - os: macos-11 + - os: macos-14 shell: bash - - os: macos-12 - shell: bash - - os: windows-2019 + - os: windows-2022 shell: wsl-bash defaults: run: @@ -52,7 +57,7 @@ jobs: uses: actions/setup-java@v4 with: java-version: ${{ matrix.java-version }} - distribution: 'temurin' + distribution: ${{ matrix.os == 'macos-14' && 'zulu' || 'temurin' }} # No Temurin JDK 8 distribution for aarch64 - name: Download and extract build validation Scripts run: | curl -L -O https://github.com/gradle/gradle-enterprise-build-validation-scripts/releases/download/development-latest/gradle-enterprise-gradle-build-validation-dev.zip From 7b6a36f56bc99b8b283bcf9c2a5c731f69aef5b6 Mon Sep 17 00:00:00 2001 From: Eric Haag Date: Fri, 26 Jul 2024 08:38:11 -0500 Subject: [PATCH 2/4] Update exp5-gradle build scan to be more recent --- .github/workflows/cross-platform-testing-build-from-source.yml | 2 +- .../cross-platform-testing-use-development-release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cross-platform-testing-build-from-source.yml b/.github/workflows/cross-platform-testing-build-from-source.yml index a82eacbe..a0475702 100644 --- a/.github/workflows/cross-platform-testing-build-from-source.yml +++ b/.github/workflows/cross-platform-testing-build-from-source.yml @@ -106,7 +106,7 @@ jobs: - name: Run Gradle Experiment 05 run: | cd gradle-enterprise-gradle-build-validation - ./05-validate-remote-build-caching-ci-local.sh -1 https://ge.solutions-team.gradle.com/s/p4ghldkcscfwi -s https://ge.solutions-team.gradle.com -u https://ge.solutions-team.gradle.com/cache/ + ./05-validate-remote-build-caching-ci-local.sh -1 https://ge.solutions-team.gradle.com/s/cemwsttqjhzhq -s https://ge.solutions-team.gradle.com -u https://ge.solutions-team.gradle.com/cache/ - name: Run Maven Experiment 01 run: | cd gradle-enterprise-maven-build-validation diff --git a/.github/workflows/cross-platform-testing-use-development-release.yml b/.github/workflows/cross-platform-testing-use-development-release.yml index c5ad9bd7..389cc594 100644 --- a/.github/workflows/cross-platform-testing-use-development-release.yml +++ b/.github/workflows/cross-platform-testing-use-development-release.yml @@ -83,7 +83,7 @@ jobs: - name: Run Gradle Experiment 05 run: | cd gradle-enterprise-gradle-build-validation - ./05-validate-remote-build-caching-ci-local.sh -1 https://ge.solutions-team.gradle.com/s/p4ghldkcscfwi -s https://ge.solutions-team.gradle.com -u https://ge.solutions-team.gradle.com/cache/ + ./05-validate-remote-build-caching-ci-local.sh -1 https://ge.solutions-team.gradle.com/s/cemwsttqjhzhq -s https://ge.solutions-team.gradle.com -u https://ge.solutions-team.gradle.com/cache/ - name: Run Maven Experiment 01 run: | cd gradle-enterprise-maven-build-validation From 1aa53b7cbf0fe52e6085445464f28ec990959c6c Mon Sep 17 00:00:00 2001 From: Eric Haag Date: Fri, 26 Jul 2024 13:17:21 -0500 Subject: [PATCH 3/4] Upgrade WSL to Ubuntu 24.04 --- .github/workflows/cross-platform-testing-build-from-source.yml | 2 +- .../cross-platform-testing-use-development-release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cross-platform-testing-build-from-source.yml b/.github/workflows/cross-platform-testing-build-from-source.yml index a0475702..7789c351 100644 --- a/.github/workflows/cross-platform-testing-build-from-source.yml +++ b/.github/workflows/cross-platform-testing-build-from-source.yml @@ -64,7 +64,7 @@ jobs: if: ${{ runner.os == 'Windows' }} uses: Vampire/setup-wsl@v3 with: - distribution: Ubuntu-22.04 + distribution: Ubuntu-24.04 additional-packages: curl unzip wget apt-transport-https gnupg - name: Set up JDK ${{ matrix.java-version }} on WSL if: ${{ runner.os == 'Windows' }} diff --git a/.github/workflows/cross-platform-testing-use-development-release.yml b/.github/workflows/cross-platform-testing-use-development-release.yml index 389cc594..d1811d25 100644 --- a/.github/workflows/cross-platform-testing-use-development-release.yml +++ b/.github/workflows/cross-platform-testing-use-development-release.yml @@ -43,7 +43,7 @@ jobs: if: ${{ runner.os == 'Windows' }} uses: Vampire/setup-wsl@v3 with: - distribution: Ubuntu-22.04 + distribution: Ubuntu-24.04 additional-packages: curl unzip wget apt-transport-https gnupg - name: Set up JDK ${{ matrix.java-version }} on WSL if: ${{ runner.os == 'Windows' }} From 7ffeece6590e1ae52130632ca89c3e86725b46e2 Mon Sep 17 00:00:00 2001 From: Eric Haag Date: Mon, 29 Jul 2024 08:31:15 -0500 Subject: [PATCH 4/4] Revert to windows-2019 The builds hang on windows-2022. --- .../workflows/cross-platform-testing-build-from-source.yml | 4 ++-- .../cross-platform-testing-use-development-release.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cross-platform-testing-build-from-source.yml b/.github/workflows/cross-platform-testing-build-from-source.yml index 7789c351..a863626e 100644 --- a/.github/workflows/cross-platform-testing-build-from-source.yml +++ b/.github/workflows/cross-platform-testing-build-from-source.yml @@ -41,7 +41,7 @@ jobs: - ubuntu-24.04 - macos-13 # x86_64 - macos-14 # aarch64 - - windows-2022 + - windows-2019 # Only LTS versions greater than 8 are tested java-version: [ '8', '11', '17', '21' ] include: @@ -51,7 +51,7 @@ jobs: shell: bash - os: macos-14 shell: bash - - os: windows-2022 + - os: windows-2019 shell: wsl-bash defaults: run: diff --git a/.github/workflows/cross-platform-testing-use-development-release.yml b/.github/workflows/cross-platform-testing-use-development-release.yml index d1811d25..cd748915 100644 --- a/.github/workflows/cross-platform-testing-use-development-release.yml +++ b/.github/workflows/cross-platform-testing-use-development-release.yml @@ -20,7 +20,7 @@ jobs: - ubuntu-24.04 - macos-13 # x86_64 - macos-14 # aarch64 - - windows-2022 + - windows-2019 # Only LTS versions greater than 8 are tested java-version: [ '8', '11', '17', '21' ] include: @@ -30,7 +30,7 @@ jobs: shell: bash - os: macos-14 shell: bash - - os: windows-2022 + - os: windows-2019 shell: wsl-bash defaults: run: