From 3d4cabfbc9f5854e5f9a5c78c55fb2dd4abf667a Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Thu, 7 May 2026 11:59:25 -0500 Subject: [PATCH] [ci] Update for merge from 2027 to main (#8857) Keep -Pbuild2027 for combine for now. --- .github/workflows/gradle.yml | 43 ++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index ab0429e933..6662f33359 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -54,7 +54,7 @@ jobs: fetch-depth: 0 - name: Set release environment variable run: echo "EXTRA_GRADLE_ARGS=-PreleaseMode" >> $GITHUB_ENV - if: startsWith(github.ref, 'refs/tags/v2027') + if: startsWith(github.ref, 'refs/tags/v') - name: Build with Gradle uses: wpilibsuite/docker-run-action@v4 with: @@ -155,16 +155,16 @@ jobs: keychain-password: ${{ secrets.APPLE_KEYCHAIN_PASSWORD }} if: | matrix.artifact-name == 'macOS' && (github.repository == 'wpilibsuite/allwpilib' && - (github.ref == 'refs/heads/2027' || startsWith(github.ref, 'refs/tags/v2027'))) + (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))) - name: Set Keychain Lock Timeout run: security set-keychain-settings -lut 21600 if: | matrix.artifact-name == 'macOS' && (github.repository == 'wpilibsuite/allwpilib' && - (github.ref == 'refs/heads/2027' || startsWith(github.ref, 'refs/tags/v2027'))) + (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))) - name: Set release environment variable run: echo "EXTRA_GRADLE_ARGS=-PreleaseMode" >> $GITHUB_ENV shell: bash - if: startsWith(github.ref, 'refs/tags/v2027') + if: startsWith(github.ref, 'refs/tags/v') - name: Build with Gradle run: ./gradlew ${{ matrix.task }} --build-cache -PbuildServer -PskipJavaFormat ${{ matrix.build-options }} ${{ env.EXTRA_GRADLE_ARGS }} env: @@ -174,7 +174,7 @@ jobs: run: ./gradlew copyAllOutputs --build-cache -PbuildServer -PskipJavaFormat -PdeveloperID=${{ secrets.APPLE_DEVELOPER_ID }} ${{ matrix.build-options }} ${{ env.EXTRA_GRADLE_ARGS }} if: | matrix.artifact-name == 'macOS' && (github.repository == 'wpilibsuite/allwpilib' && - (github.ref == 'refs/heads/2027' || startsWith(github.ref, 'refs/tags/v2027'))) + (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))) - uses: actions/upload-artifact@v7 with: name: ${{ matrix.artifact-name }} @@ -198,7 +198,7 @@ jobs: java-version: 25 - name: Set release environment variable run: echo "EXTRA_GRADLE_ARGS=-PreleaseMode" >> $GITHUB_ENV - if: startsWith(github.ref, 'refs/tags/v2027') + if: startsWith(github.ref, 'refs/tags/v') - name: Build with Gradle run: ./gradlew docs:zipDocs --build-cache -PbuildServer -PdocWarningsAsErrors ${{ env.EXTRA_GRADLE_ARGS }} env: @@ -240,17 +240,12 @@ jobs: run: | echo "EXTRA_GRADLE_ARGS=-PreleaseMode" >> $GITHUB_ENV echo "BRANCH=beta" >> $GITHUB_ENV - if: startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, '2027') + if: startsWith(github.ref, 'refs/tags/v') - name: Set environment variables (Release) run: | echo "EXTRA_GRADLE_ARGS=-PreleaseMode" >> $GITHUB_ENV echo "BRANCH=release" >> $GITHUB_ENV - if: startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, 'alpha') && !contains(github.ref, 'beta') && !contains(github.ref, '2027') - - name: Set environment variables (2027) - run: | - echo "EXTRA_GRADLE_ARGS=-PreleaseMode" >> $GITHUB_ENV - echo "BRANCH=2027" >> $GITHUB_ENV - if: startsWith(github.ref, 'refs/tags/v') && contains(github.ref, '2027') + if: startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, 'alpha') && !contains(github.ref, 'beta') - name: Install SSH Client 🔑 uses: webfactory/ssh-agent@v0.9.1 with: @@ -284,7 +279,7 @@ jobs: - name: Free disk space if: | github.repository == 'wpilibsuite/allwpilib' && - (github.ref == 'refs/heads/2027' || startsWith(github.ref, 'refs/tags/v2027')) + (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) uses: jlumbroso/free-disk-space@main with: tool-cache: false @@ -298,47 +293,47 @@ jobs: - uses: actions/checkout@v6 if: | github.repository == 'wpilibsuite/allwpilib' && - (github.ref == 'refs/heads/2027' || startsWith(github.ref, 'refs/tags/v2027')) + (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) with: repository: wpilibsuite/build-tools - uses: actions/download-artifact@v7 if: | github.repository == 'wpilibsuite/allwpilib' && - (github.ref == 'refs/heads/2027' || startsWith(github.ref, 'refs/tags/v2027')) + (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) with: path: combiner/products/build/allOutputs - name: Flatten Artifacts if: | github.repository == 'wpilibsuite/allwpilib' && - (github.ref == 'refs/heads/2027' || startsWith(github.ref, 'refs/tags/v2027')) + (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) run: rsync -a --delete combiner/products/build/allOutputs/*/* combiner/products/build/allOutputs/ - name: Check version number exists if: | github.repository == 'wpilibsuite/allwpilib' && - (github.ref == 'refs/heads/2027' || startsWith(github.ref, 'refs/tags/v2027')) + (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) run: | cat combiner/products/build/allOutputs/version.txt test -s combiner/products/build/allOutputs/version.txt - uses: actions/setup-java@v5 if: | github.repository == 'wpilibsuite/allwpilib' && - (github.ref == 'refs/heads/2027' || startsWith(github.ref, 'refs/tags/v2027')) + (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) with: distribution: 'temurin' java-version: 25 - - name: Combine (2027) + - name: Combine if: | github.repository == 'wpilibsuite/allwpilib' && - github.ref == 'refs/heads/2027' + github.ref == 'refs/heads/main' run: cd combiner && ./gradlew publish -Pallwpilib -Pbuild2027 env: RUN_AZURE_ARTIFACTORY_RELEASE: "TRUE" ARTIFACTORY_PUBLISH_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} ARTIFACTORY_PUBLISH_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} - - name: Combine (2027 Release) + - name: Combine (Release) if: | github.repository == 'wpilibsuite/allwpilib' && - startsWith(github.ref, 'refs/tags/v2027') + startsWith(github.ref, 'refs/tags/v') run: cd combiner && ./gradlew publish -Pallwpilib -PreleaseRepoPublish -Pbuild2027 env: RUN_AZURE_ARTIFACTORY_RELEASE: "TRUE" @@ -347,7 +342,7 @@ jobs: - uses: actions/upload-artifact@v7 if: | github.repository == 'wpilibsuite/allwpilib' && - (github.ref == 'refs/heads/2027' || startsWith(github.ref, 'refs/tags/v2027')) + (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) with: name: Maven path: ~/releases