From b897ee0cb34d6d05b15fd6450358a5cbe4970ef3 Mon Sep 17 00:00:00 2001 From: Corneil du Plessis Date: Thu, 17 Aug 2023 08:47:05 +0200 Subject: [PATCH] [CI] Remove postfix and prerelease properties [skip ci] --- .github/actions/publish-bundle/action.yml | 15 +++------------ .github/workflows/build-snapshot-worker.yml | 2 -- .github/workflows/carvel-worker.yml | 9 +-------- .github/workflows/ci-carvel.yml | 4 ---- .github/workflows/common-carvel.yml | 10 ---------- .github/workflows/export-app-versions.sh | 8 -------- .github/workflows/milestone-worker.yml | 2 -- 7 files changed, 4 insertions(+), 46 deletions(-) diff --git a/.github/actions/publish-bundle/action.yml b/.github/actions/publish-bundle/action.yml index 9d80236019..17c1ab1969 100644 --- a/.github/actions/publish-bundle/action.yml +++ b/.github/actions/publish-bundle/action.yml @@ -10,10 +10,7 @@ inputs: version: description: semver version required: true - prerelease: - description: semver version prerelease - required: false - + runs: using: "composite" steps: @@ -27,15 +24,9 @@ runs: BUNDLE_PATH: ${{ inputs.path }} REPOSITORY: ${{ inputs.repository }} VERSION: ${{ inputs.version }} - PRERELEASE: ${{ inputs.prerelease }} shell: bash run: | imgpkg push --bundle $REPOSITORY:$VERSION-RANDOM.$RTAG --file $BUNDLE_PATH docker pull $REPOSITORY:$VERSION-RANDOM.$RTAG - if [[ "$VERSION" = *"SNAPSHOT"* ]]; then - POSTFIX=$VERSION - else - POSTFIX=$VERSION${PRERELEASE:+"-$PRERELEASE"} - fi - docker tag $REPOSITORY:$VERSION-RANDOM.$RTAG $REPOSITORY:$POSTFIX - docker push $REPOSITORY:$POSTFIX + docker tag $REPOSITORY:$VERSION-RANDOM.$RTAG $REPOSITORY:$VERSION + docker push $REPOSITORY:$VERSION diff --git a/.github/workflows/build-snapshot-worker.yml b/.github/workflows/build-snapshot-worker.yml index e1d22beb98..fb752cacfe 100644 --- a/.github/workflows/build-snapshot-worker.yml +++ b/.github/workflows/build-snapshot-worker.yml @@ -69,8 +69,6 @@ jobs: echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-main >> $GITHUB_ENV echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildnumber=$GITHUB_RUN_NUMBER >> $GITHUB_ENV echo BUILD_ZOO_HANDLER_spring_cloud_skipper_version=$(mvn help:evaluate -Dexpression=spring-cloud-skipper.version -pl spring-cloud-dataflow-parent -q -DforceStdout) >> $GITHUB_ENV - echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version_nopostfix=$(echo '${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}' | mvn build-helper:parse-version help:evaluate -q -DforceStdout) >> $GITHUB_ENV - echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_prerelease=$(echo '${parsedVersion.qualifier}' | mvn build-helper:parse-version help:evaluate -q -DforceStdout) >> $GITHUB_ENV # build and publish images via composite action - name: Build and Publish Images diff --git a/.github/workflows/carvel-worker.yml b/.github/workflows/carvel-worker.yml index 5c906cbea6..f97cc9ef0e 100644 --- a/.github/workflows/carvel-worker.yml +++ b/.github/workflows/carvel-worker.yml @@ -20,17 +20,12 @@ jobs: uses: jvalkeal/build-zoo-handler@v0.0.4 with: dispatch-handler-extract-context-properties: true - ensure-env: | - BUILD_ZOO_HANDLER_spring_cloud_dataflow_version - BUILD_ZOO_HANDLER_spring_cloud_dataflow_version_nopostfix - BUILD_ZOO_HANDLER_spring_cloud_dataflow_prerelease + ensure-env: BUILD_ZOO_HANDLER_spring_cloud_dataflow_version outputs: dataflow-version: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }} - dataflow-version-no-postfix: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version_nopostfix }} skipper-version: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }} server-version: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }} ctr-version: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }} - prerelease: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_prerelease }} publish: name: Publish needs: @@ -39,14 +34,12 @@ jobs: with: package-name: 'scdf' package-version: ${{ needs.prepare.outputs.server-version }} - dataflow-version-no-postfix: ${{ needs.prepare.outputs.dataflow-version-no-postfix }} package-bundle: 'springcloud/scdf-oss-package' repository-bundle: 'springcloud/scdf-oss-repo' dataflow-version: ${{ needs.prepare.outputs.dataflow-version }} server-version: ${{ needs.prepare.outputs.server-version }} ctr-version: ${{ needs.prepare.outputs.dataflow-version }} skipper-version: ${{ needs.prepare.outputs.skipper-version }} - prerelease: ${{ needs.prepare.outputs.prerelease }} server-repository: 'springcloud/spring-cloud-dataflow-server' secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} diff --git a/.github/workflows/ci-carvel.yml b/.github/workflows/ci-carvel.yml index c995385f4a..04ce01677b 100644 --- a/.github/workflows/ci-carvel.yml +++ b/.github/workflows/ci-carvel.yml @@ -60,7 +60,6 @@ jobs: source $ROOT/.github/workflows/export-app-versions.sh echo DATAFLOW_VERSION=$DATAFLOW_VERSION >> $GITHUB_ENV echo SKIPPER_VERSION=$SKIPPER_VERSION >> $GITHUB_ENV - echo DATAFLOW_VERSION_NOPOSTFIX=$DATAFLOW_VERSION_NOPOSTFIX >> $GITHUB_ENV if [ "${{ inputs.package_version }}" != "" ]; then echo PACKAGE_VERSION=${{ inputs.package_version }} >> $GITHUB_ENV else @@ -70,7 +69,6 @@ jobs: outputs: dataflow-version: ${{ env.DATAFLOW_VERSION }} skipper-version: ${{ env.SKIPPER_VERSION }} - dataflow-version-no-postfix: ${{ env.DATAFLOW_VERSION_NOPOSTFIX }} package-version: ${{ env.PACKAGE_VERSION }} publish: name: Publish @@ -84,11 +82,9 @@ jobs: package-bundle: 'springcloud/scdf-oss-package' repository-bundle: 'springcloud/scdf-oss-repo' dataflow-version: ${{ needs.prepare.outputs.dataflow-version }} - dataflow-version-no-postfix: ${{ needs.prepare.outputs.dataflow-version-no-postfix }} server-version: ${{ needs.prepare.outputs.dataflow-version }} ctr-version: ${{ needs.prepare.outputs.dataflow-version }} skipper-version: ${{ needs.prepare.outputs.skipper-version }} - prerelease: 'SNAPSHOT' secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/common-carvel.yml b/.github/workflows/common-carvel.yml index 7a8eb1bfda..51bcfa4fb2 100644 --- a/.github/workflows/common-carvel.yml +++ b/.github/workflows/common-carvel.yml @@ -27,10 +27,6 @@ on: type: string description: 'Server Version' required: true - dataflow-version-no-postfix: - type: string - description: 'Spring Cloud Data Flow Container Release Version' - required: true skipper-version: type: string description: 'Spring Cloud Skipper Container Version' @@ -43,10 +39,6 @@ on: type: string description: 'Docker repo for Data Flow Server' required: true - prerelease: - type: string - description: 'Empty for release' - required: false secrets: DOCKERHUB_USERNAME: DOCKERHUB_TOKEN: @@ -92,7 +84,6 @@ jobs: path: '${{ steps.build-package-bundle.outputs.bundle-path }}' repository: ${{ inputs.package-bundle }} version: ${{ inputs.package-version }} - prerelease: ${{ inputs.prerelease && inputs.prerelease || '' }} # Builds a repository bundle - name: Build Repository Bundle @@ -112,4 +103,3 @@ jobs: path: '${{ steps.build-repository-bundle.outputs.bundle-path }}' repository: ${{ inputs.repository-bundle }} version: ${{ inputs.package-version }} - prerelease: ${{ inputs.prerelease && inputs.prerelease || '' }} diff --git a/.github/workflows/export-app-versions.sh b/.github/workflows/export-app-versions.sh index 370cf8cad3..8f50d73d39 100755 --- a/.github/workflows/export-app-versions.sh +++ b/.github/workflows/export-app-versions.sh @@ -17,13 +17,5 @@ if ((RC!=0)); then exit $RC fi echo "SKIPPER_VERSION=$SKIPPER_VERSION" -DATAFLOW_VERSION_NOPOSTFIX=$(echo '${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}' | mvn build-helper:parse-version help:evaluate -q -DforceStdout) -RC=$? -if ((RC!=0)); then - echo "DATAFLOW_VERSION_NOPOSTFIX=$DATAFLOW_VERSION_NOPOSTFIX" - exit $RC -fi -echo "DATAFLOW_VERSION_NOPOSTFIX=$DATAFLOW_VERSION_NOPOSTFIX" export DATAFLOW_VERSION export SKIPPER_VERSION -export DATAFLOW_VERSION_NOPOSTFIX diff --git a/.github/workflows/milestone-worker.yml b/.github/workflows/milestone-worker.yml index 7a3baf703a..5b535c3efb 100644 --- a/.github/workflows/milestone-worker.yml +++ b/.github/workflows/milestone-worker.yml @@ -92,8 +92,6 @@ jobs: echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$(mvn -gs .github/settings.xml -Pstagingmilestone help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-main-milestone >> $GITHUB_ENV echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildnumber=$GITHUB_RUN_NUMBER >> $GITHUB_ENV - echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version_nopostfix=$(echo '${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}' | mvn -gs .github/settings.xml -Pstagingmilestone build-helper:parse-version help:evaluate -q -DforceStdout) >> $GITHUB_ENV - echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_prerelease=$(echo '${parsedVersion.qualifier}' | mvn -gs .github/settings.xml -Pstagingmilestone build-helper:parse-version help:evaluate -pl spring-cloud-dataflow-parent -q -DforceStdout) >> $GITHUB_ENV # zoo tag - name: Tag Release uses: jvalkeal/build-zoo-handler@v0.0.4