From ab8fb679e2814a263480899db219d646dde69491 Mon Sep 17 00:00:00 2001 From: Janne Valkealahti Date: Sun, 10 Mar 2024 12:30:28 +0000 Subject: [PATCH] Fork 3.2.x maintenance branch --- .github/workflows/central-sync-close.yml | 23 ------------------ .github/workflows/central-sync-release.yml | 23 ------------------ .github/workflows/ci.yml | 2 +- .github/workflows/label-manage.yml | 23 ------------------ .github/workflows/next-dev-version.yml | 2 +- .github/workflows/release-ga.yml | 6 ++--- .github/workflows/release-milestone.yml | 4 ++-- .github/workflows/schedule-e2e.yml | 27 ---------------------- 8 files changed, 7 insertions(+), 103 deletions(-) delete mode 100644 .github/workflows/central-sync-close.yml delete mode 100644 .github/workflows/central-sync-release.yml delete mode 100644 .github/workflows/label-manage.yml delete mode 100644 .github/workflows/schedule-e2e.yml diff --git a/.github/workflows/central-sync-close.yml b/.github/workflows/central-sync-close.yml deleted file mode 100644 index 50ad269d..00000000 --- a/.github/workflows/central-sync-close.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Central Sync Close - -on: - workflow_dispatch: - inputs: - stagedRepositoryId: - description: "Staged repository id" - required: true - -jobs: - build: - runs-on: ubuntu-latest - steps: - - # Request release promotion repo - - uses: jvalkeal/nexus-sync@v0 - with: - url: ${{ secrets.OSSRH_URL }} - username: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }} - password: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }} - staging-profile-name: ${{ secrets.OSSRH_STAGING_PROFILE_NAME }} - staging-repo-id: ${{ github.event.inputs.stagedRepositoryId }} - close: true diff --git a/.github/workflows/central-sync-release.yml b/.github/workflows/central-sync-release.yml deleted file mode 100644 index 3fc5b56d..00000000 --- a/.github/workflows/central-sync-release.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Central Sync Release - -on: - workflow_dispatch: - inputs: - stagedRepositoryId: - description: "Staged repository id" - required: true - -jobs: - build: - runs-on: ubuntu-latest - steps: - - # Request release promotion repo - - uses: jvalkeal/nexus-sync@main - with: - url: ${{ secrets.OSSRH_URL }} - username: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }} - password: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }} - staging-profile-name: ${{ secrets.OSSRH_STAGING_PROFILE_NAME }} - staging-repo-id: ${{ github.event.inputs.stagedRepositoryId }} - release: true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index acaf4687..6c497f24 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,7 +56,7 @@ jobs: --server-id-deploy repo.spring.io \ --repo-resolve snapshot \ --repo-deploy snapshot - echo JFROG_CLI_BUILD_NAME=spring-shell-main >> $GITHUB_ENV + echo JFROG_CLI_BUILD_NAME=spring-shell-32x >> $GITHUB_ENV echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV - name: Build and Publish run: | diff --git a/.github/workflows/label-manage.yml b/.github/workflows/label-manage.yml deleted file mode 100644 index bcee14cd..00000000 --- a/.github/workflows/label-manage.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Labels Manage - -on: - push: - branches: - - 'main' - paths: - - '.github/labels-manage.yml' - - '.github/workflows/label-manage.yml' - workflow_dispatch: - -jobs: - labeler: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Mangle Labels - uses: crazy-max/ghaction-github-labeler@v3 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - yaml-file: .github/labels-manage.yml - dry-run: false - skip-delete: true diff --git a/.github/workflows/next-dev-version.yml b/.github/workflows/next-dev-version.yml index 0334d602..b4f6e6c7 100644 --- a/.github/workflows/next-dev-version.yml +++ b/.github/workflows/next-dev-version.yml @@ -18,5 +18,5 @@ jobs: - name: Commit Next Dev Changes uses: jvalkeal/build-zoo-handler@v0.0.4 with: - commit-changes-branch: main + commit-changes-branch: 3.2.x commit-changes-message: Next development version diff --git a/.github/workflows/release-ga.yml b/.github/workflows/release-ga.yml index 74b1ab07..766f468d 100644 --- a/.github/workflows/release-ga.yml +++ b/.github/workflows/release-ga.yml @@ -33,7 +33,7 @@ jobs: --server-id-deploy repo.spring.io \ --repo-resolve release \ --repo-deploy libs-staging-local - echo JFROG_CLI_BUILD_NAME=spring-shell-main-release >> $GITHUB_ENV + echo JFROG_CLI_BUILD_NAME=spring-shell-32x-release >> $GITHUB_ENV echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV - name: Configure Release Version run: | @@ -82,7 +82,7 @@ jobs: JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} - name: Configure JFrog Cli run: | - echo JFROG_CLI_BUILD_NAME=spring-shell-main-release >> $GITHUB_ENV + echo JFROG_CLI_BUILD_NAME=spring-shell-32x-release >> $GITHUB_ENV echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV - name: Promote Build run: | @@ -158,7 +158,7 @@ jobs: JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} - name: Configure JFrog Cli run: | - echo JFROG_CLI_BUILD_NAME=spring-shell-main-release >> $GITHUB_ENV + echo JFROG_CLI_BUILD_NAME=spring-shell-32x-release >> $GITHUB_ENV echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV - name: Download Release Files run: | diff --git a/.github/workflows/release-milestone.yml b/.github/workflows/release-milestone.yml index 631194e3..3c192c4a 100644 --- a/.github/workflows/release-milestone.yml +++ b/.github/workflows/release-milestone.yml @@ -36,7 +36,7 @@ jobs: --server-id-deploy repo.spring.io \ --repo-resolve milestone \ --repo-deploy libs-staging-local - echo JFROG_CLI_BUILD_NAME=spring-shell-main-milestone >> $GITHUB_ENV + echo JFROG_CLI_BUILD_NAME=spring-shell-32x-milestone >> $GITHUB_ENV echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV - name: Configure Milestone Version run: | @@ -86,7 +86,7 @@ jobs: JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} - name: Configure JFrog Cli run: | - echo JFROG_CLI_BUILD_NAME=spring-shell-main-milestone >> $GITHUB_ENV + echo JFROG_CLI_BUILD_NAME=spring-shell-32x-milestone >> $GITHUB_ENV echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV - name: Promote Build run: | diff --git a/.github/workflows/schedule-e2e.yml b/.github/workflows/schedule-e2e.yml deleted file mode 100644 index a5c4714f..00000000 --- a/.github/workflows/schedule-e2e.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Schedule e2e - -on: - workflow_dispatch: - schedule: - - cron: '0 0 * * 1,3,5' - -permissions: - actions: write - -jobs: - dispatch_e2e: - name: Dispatch e2e - if: github.repository_owner == 'spring-projects' - strategy: - matrix: - branch: [ main, 3.1.x ] - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 1 - - name: Dispatch - env: - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - run: gh workflow run e2e.yml -r ${{ matrix.branch }}