From d7f0459874d3746e514573b59ac73b29de322799 Mon Sep 17 00:00:00 2001 From: Janne Valkealahti Date: Tue, 24 Jan 2023 12:34:26 +0000 Subject: [PATCH] Change workflows for new branch --- .github/workflows/ci-publish.yml | 40 ------------------------- .github/workflows/ci.yml | 2 +- .github/workflows/next-dev-version.yml | 2 +- .github/workflows/release-ga.yml | 6 ++-- .github/workflows/release-milestone.yml | 4 +-- 5 files changed, 7 insertions(+), 47 deletions(-) delete mode 100644 .github/workflows/ci-publish.yml diff --git a/.github/workflows/ci-publish.yml b/.github/workflows/ci-publish.yml deleted file mode 100644 index 92c92e10..00000000 --- a/.github/workflows/ci-publish.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: CI Publish - -on: - workflow_call: - secrets: - jfArtifactorySpring: - required: true - -jobs: - publish: - runs-on: ubuntu-latest - name: CI Publish - steps: - - uses: actions/checkout@v2 - - uses: jvalkeal/setup-maven@v1 - with: - maven-version: 3.8.4 - - uses: actions/setup-java@v2 - with: - distribution: adopt - java-version: 17 - - uses: jfrog/setup-jfrog-cli@v2 - with: - version: 2.21.5 - env: - JF_ARTIFACTORY_SPRING: ${{ secrets.jfArtifactorySpring }} - - name: Configure JFrog Cli - run: | - jfrog rt mvnc \ - --server-id-deploy repo.spring.io \ - --repo-deploy-releases release \ - --repo-deploy-snapshots snapshot - echo JFROG_CLI_BUILD_NAME=spring-shell-main >> $GITHUB_ENV - echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV - - name: Build and Publish - env: - DISABLE_SAMPLES: true - run: | - jfrog rt mvn clean install -B -DskipTests - jfrog rt build-publish diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 556459f4..9d157b3e 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-30x >> $GITHUB_ENV echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV - name: Build and Publish run: | diff --git a/.github/workflows/next-dev-version.yml b/.github/workflows/next-dev-version.yml index f03ae24c..1972e21c 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.0.x commit-changes-message: Next development version diff --git a/.github/workflows/release-ga.yml b/.github/workflows/release-ga.yml index df8636eb..bfff4424 100644 --- a/.github/workflows/release-ga.yml +++ b/.github/workflows/release-ga.yml @@ -31,7 +31,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-30x-release >> $GITHUB_ENV echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV - name: Configure Release Version run: | @@ -80,7 +80,7 @@ jobs: JF_ARTIFACTORY_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-30x-release >> $GITHUB_ENV echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV - name: Promote Build run: | @@ -156,7 +156,7 @@ jobs: JF_ARTIFACTORY_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-30x-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 6ac557c2..05dedb2f 100644 --- a/.github/workflows/release-milestone.yml +++ b/.github/workflows/release-milestone.yml @@ -35,7 +35,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-30x-milestone >> $GITHUB_ENV echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV - name: Configure Milestone Version run: | @@ -85,7 +85,7 @@ jobs: JF_ARTIFACTORY_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-30x-milestone >> $GITHUB_ENV echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV - name: Promote Build run: |