#25951 Testing next version setup.

dotCMS · Sep 21, 2023 · 27c38bb · 27c38bb
1 parent 2fbe8f7
commit 27c38bb
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 11 deletions.
diff --git a/.github/workflows/cli-release-process.yml b/.github/workflows/cli-release-process.yml
@@ -58,9 +58,8 @@ jobs:
         run: |
           VERSION=${{ github.event.inputs.version }}
           NEXT=${{ github.event.inputs.next }}
-          HEAD=${{ github.ref_name }}
           
-          GIT_HEAD=`git rev-parse HEAD`
+          HEAD=`git rev-parse HEAD`
           echo "GIT_HEAD=$GIT_HEAD"
           
           ./mvnw -B -ntp versions:set versions:commit -DnewVersion=$VERSION
@@ -70,12 +69,36 @@ jobs:
           
           echo "VERSION=$VERSION" >> "$GITHUB_OUTPUT"
           echo "NEXT=$NEXT" >> "$GITHUB_OUTPUT"
-
+          echo "HEAD=$HEAD" >> "$GITHUB_OUTPUT"
   release:
     needs: [ precheck ]
     runs-on: ubuntu-latest
     steps:
-      - name: vars
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          java-version: ${{ env.JAVA_VERSION }}
+          distribution: ${{ env.JAVA_DISTRO }}
+
+      - name: Cache Maven
+        uses: actions/cache@v3
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+
+      - name: Set next version
         run: |
-          echo "REF=${{ github.ref }}"
-          echo "REF_NAME=${{ github.ref_name }}"
+          VERSION=${{ needs.precheck.outputs.VERSION }}
+          NEXT=${{ needs.precheck.outputs.NEXT }}
+          HEAD=${{ needs.precheck.outputs.HEAD }}
+          
+          ./mvnw -B -ntp versions:set versions:commit -DnewVersion=$NEXT
+
+          git commit -a -m "⬆️  Next version $NEXT"
+          git push origin "$HEAD"
diff --git a/tools/dotcms-cli/api-data-model/pom.xml b/tools/dotcms-cli/api-data-model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dotCMS-cli</artifactId>
         <groupId>com.dotcms</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/tools/dotcms-cli/cli/pom.xml b/tools/dotcms-cli/cli/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dotCMS-cli</artifactId>
         <groupId>com.dotcms</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -40,13 +40,13 @@
         <dependency>
             <groupId>com.dotcms</groupId>
             <artifactId>api-data-model</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>com.dotcms</groupId>
             <artifactId>api-data-model</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.0-SNAPSHOT</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

diff --git a/tools/dotcms-cli/pom.xml b/tools/dotcms-cli/pom.xml
@@ -5,7 +5,7 @@
   <groupId>com.dotcms</groupId>
   <artifactId>dotCMS-cli</artifactId>
   <packaging>pom</packaging>
-  <version>1.0.0</version>
+  <version>1.0.0-SNAPSHOT</version>
   <modules>
     <module>api-data-model</module>
     <module>cli</module>