[CI] Fix github release scripts. [skip-ci]

spring-cloud · Jan 12, 2024 · ab77267 · ab77267
1 parent 9300b18
commit ab77267
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 22 deletions.
diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml
@@ -123,22 +123,12 @@ jobs:
             --title "Spring Cloud Data Flow $BUILD_ZOO_HANDLER_spring_cloud_dataflow_version" \
             --notes-file $RELEASE_NOTES_FILE
           # retrieve spring-cloud-dataflow-package and upload to github release
-          set +e
           export PACKAGE_VERSION=${$BUILD_ZOO_HANDLER_spring_cloud_dataflow_version}
-          mvn -gs .github/settings.xml \
-              dependency:copy \
-              -Dartifact=org.springframework.cloud:spring-cloud-dataflow-package:${PACKAGE_VERSION}:zip \
-              -DoutputDirectory=./spring-cloud-dataflow-package/target
-          RC=$?
-          if ((RC!=0)); then            
-            ./spring-cloud-dataflow-package/set-package-version.sh
-            ./mvnw -pl spring-cloud-dataflow-package          
-          fi
-          PACKAGE_FILE="./spring-cloud-dataflow-package/target/spring-cloud-dataflow-oss-install-${PACKAGE_VERSION}.zip"
-          DL_PACKAGE_FILE="./spring-cloud-dataflow-package/target/spring-cloud-dataflow-package-${PACKAGE_VERSION}.zip"
-          if [ ! -f $PACKAGE_FILE ]; then 
-            cp -f $DL_PACKAGE_FILE $PACKAGE_FILE
-          fi
+          pushd spring-cloud-dataflow-package 
+            ./set-package-version.sh
+            ../mvnw package
+          popd
+          PACKAGE_FILE="./spring-cloud-dataflow-package/target/spring-cloud-dataflow-oss-install-${PACKAGE_VERSION}.zip"          
           gh release upload v$PACKAGE_VERSION $PACKAGE_FILE --clobber
         # zoo success
       - name: Notify Build Success Zoo Handler Controller

diff --git a/spring-cloud-dataflow-package/set-package-version.sh b/spring-cloud-dataflow-package/set-package-version.sh
@@ -15,6 +15,8 @@ fi
 echo "PACKAGE_VERSION=$PACKAGE_VERSION"
 if [[ "$PACKAGE_VERSION" != *"SNAPSHOT"* ]]; then
     yq '.default.version="release"' -i "$SCDIR/../src/deploy/versions.yaml"
-    echo "Setting default.version=release $PACKAGE_VERSION"
+    echo "Setting default.version=release, default.package-version=$PACKAGE_VERSION"
     yq ".default.package-version=\"$PACKAGE_VERSION\"" -i "$SCDIR/../src/deploy/versions.yaml"
+    echo "Setting scdf-type.oss.release=$PACKAGE_VERSION"
+    yq ".scdf-type.oss.release=\"$PACKAGE_VERSION\"" -i "$SCDIR/../src/deploy/versions.yaml"
 fi
diff --git a/src/deploy/versions.yaml b/src/deploy/versions.yaml
@@ -1,14 +1,14 @@
 scdf-type:
   oss:
-    release: '2.11.1'
-    snapshot: '2.11.2-SNAPSHOT'
+    release: '2.11.2'
+    snapshot: '2.11.3-SNAPSHOT'
     milestone: '2.11.0-RC1'
     maintenance-snapshot: '2.10.4-SNAPSHOT'
   pro:
-    release: '1.6.0'
-    snapshot: '1.6.1-SNAPSHOT'
+    release: '1.6.1'
+    snapshot: '1.6.2-SNAPSHOT'
     maintenance-snapshot: '1.5.4-SNAPSHOT'
 default:
   scdf-type: 'oss'
-  version: 'snapshot'
-  package-version: '2.11.2-SNAPSHOT'
+  version: 'release'
+  package-version: '2.11.3-SNAPSHOT'