Prep for 1.1.0-Beta1 release

Apicurio · Nov 11, 2024 · 2025917 · 2025917
1 parent 9b4b960
commit 2025917
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 37 deletions.
diff --git a/.github/workflows/release-images.yaml b/.github/workflows/release-images.yaml
@@ -24,12 +24,6 @@ jobs:
     if: github.repository_owner == 'Apicurio'
     runs-on: ubuntu-22.04
     steps:
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
@@ -63,18 +57,6 @@ jobs:
 
       - name: Download Source Code
         run: git clone --branch $RELEASE_VERSION --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git studio
-
-      # We have faced issues in the past where a github release was created from a wrong commit
-      # This step will ensure that the release was created from the right commit  
-      - name: Verify Project Version
-        run: |
-          cd studio
-          PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-          if [[ $PROJECT_VERSION != $RELEASE_VERSION ]]
-          then
-              echo "ERROR: Project Version '${PROJECT_VERSION}' does not match with Released Version '${RELEASE_VERSION}'"
-              exit 1	  
-          fi      
 
       - name: Build Apicurio Studio
         run: |
@@ -99,8 +81,10 @@ jobs:
           tags: |
             docker.io/${{env.IMAGE_ORG}}/apicurio-studio-ui:${{env.RELEASE_VERSION}}
             docker.io/${{env.IMAGE_ORG}}/apicurio-studio-ui:latest
+            docker.io/${{env.IMAGE_ORG}}/apicurio-studio-ui:latest-release
             quay.io/${{env.IMAGE_ORG}}/apicurio-studio-ui:${{env.RELEASE_VERSION}}
             quay.io/${{env.IMAGE_ORG}}/apicurio-studio-ui:latest
+            quay.io/${{env.IMAGE_ORG}}/apicurio-studio-ui:latest-release
 
       - name: Google Chat Notification (Always)
         if: always()

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -5,8 +5,8 @@ on:
       release-version:
         description: 'Version being released'
         required: true
-      snapshot-version:
-        description: 'Next snapshot version'
+      dev-version:
+        description: 'Next -Dev version'
         required: true
       branch:
         description: 'Branch to release from'
@@ -25,7 +25,7 @@ jobs:
           echo "Release Version: ${{ github.event.inputs.release-version }}
           echo "Release Branch: ${{ github.event.inputs.branch }}"
           echo "Release Actor: ${{ env.GITHUB_ACTOR }}"
-          echo "Next Snapshot Version: ${{ github.event.inputs.snapshot-version }}"
+          echo "Next Snapshot Version: ${{ github.event.inputs.dev-version }}"
           echo "==========================================================================================================="
 
       - name: Configure Git
@@ -45,21 +45,23 @@ jobs:
         with:
           node-version: 20
 
-      - name: Update Release Version ${{ github.event.inputs.release-version }} in pom.xml
+      - name: Update Release Version ${{ github.event.inputs.release-version }} in package.json files
         run: |
-          cd studio
-          UI_VERSION=$(echo ${{ github.event.inputs.release-version }} | sed 's/.Beta[0-9]//' | sed 's/.Alpha[0-9]//'| sed 's/.RC[0-9]//')
-          cd ui
+          UI_VERSION=$(echo "${{ github.event.inputs.release-version}}" | awk -F '[.-]' '{print $1"."$2"."$3}')
+          cd studio/ui
           npm version $UI_VERSION --allow-same-version
           cd ui-app
           npm version $UI_VERSION --allow-same-version
           cd ../ui-editors
           npm version $UI_VERSION --allow-same-version
+          cd ../tests
+          npm version $UI_VERSION --allow-same-version
 
       - name: Build Apicurio Studio
         run: |
           cd studio/ui
           npm install
+          npm run lint
           npm run build
           npm run package
 
@@ -91,22 +93,23 @@ jobs:
           target_commitish: ${{ env.latest-commit-sha }}
           prerelease: false
 
-      - name: Update Next Snapshot Version ${{ github.event.inputs.snapshot-version }}
+      - name: Update Next Snapshot Version ${{ github.event.inputs.dev-version }}
         run: |
-          cd studio
-          UI_VERSION=$(echo ${{ github.event.inputs.snapshot-version }} | sed 's/-SNAPSHOT//')
-          cd ui
+          UI_VERSION=$(echo ${{ github.event.inputs.dev-version }} | sed 's/-SNAPSHOT//')
+          cd studio/ui
           npm version $UI_VERSION --allow-same-version
           cd ui-app
           npm version $UI_VERSION --allow-same-version
           cd ../ui-editors
           npm version $UI_VERSION --allow-same-version
+          cd ../tests
+          npm version $UI_VERSION --allow-same-version
 
-      - name: Push Changes for Next Snapshot Version ${{ github.event.inputs.snapshot-version }}
+      - name: Push Changes for Next Snapshot Version ${{ github.event.inputs.dev-version }}
         run: |
           cd studio
           git add .
-          git commit -m "Automated update for Next Snapshot Version: ${{ github.event.inputs.snapshot-version }}"
+          git commit -m "Automated update for Next Snapshot Version: ${{ github.event.inputs.dev-version }}"
           git push origin ${{github.event.inputs.branch}}
 
       - name: Google Chat Notification (Always)

diff --git a/.github/workflows/update-website.yaml b/.github/workflows/update-website.yaml
@@ -1,8 +1,6 @@
 name: Update Website
 on:
   workflow_dispatch: {}
-  release:
-    types: [released]
 
 jobs:
   update-website:

diff --git a/ui/package.json b/ui/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@apicurio/apicurio-studio",
     "private": true,
-    "version": "1.1.0",
+    "version": "1.1.0-Dev",
     "type": "module",
     "scripts": {
         "postinstall": "npm install --prefix ./ui-app && npm install --prefix ./ui-editors",

diff --git a/ui/tests/package.json b/ui/tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apicurio/studio-ui-tests",
-  "version": "1.0.0",
+  "version": "1.1.0-Dev",
   "description": "UI tests (playwright) for Apicurio Studio UI",
   "repository": "https://github.com/Apicurio/apicurio-studio.git",
   "main": "index.js",

diff --git a/ui/ui-app/package.json b/ui/ui-app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@apicurio/apicurio-studio-ui",
   "private": true,
-  "version": "1.1.0",
+  "version": "1.1.0-Dev",
   "type": "module",
   "license": "Apache-2.0",
   "repository": "https://github.com/Apicurio/apicurio-studio.git",

diff --git a/ui/ui-editors/package.json b/ui/ui-editors/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@apicurio/apicurio-studio-editors",
-    "version": "1.1.0",
+    "version": "1.1.0-Dev",
     "scripts": {
         "clean": "rimraf dist",
         "dev": "ng serve --port 9011",