merge

Author: felipesu19

.github/workflows/pre-prepare.yml

@@ -1,13 +1,23 @@
 name: Create release PR
 
-run-name: Create release PR for v${{ github.event.inputs.version }}
+run-name: Create release PR for new ${{ github.event.inputs.version }} version
 
 on:
   workflow_dispatch:
     inputs:
       version:
         required: true
-        description: "Version to bump `package.json` to (format: x.y.z)"
+        type: choice
+        description: "What type of release is this"
+        options:
+          - "major"
+          - "minor"
+          - "patch"
+      update-language-server: 
+        required: true
+        description: "Update the language server to the latest version?"
+        type: boolean
+
 
 jobs:
   create-release-pr:
@@ -31,13 +41,29 @@ jobs:
           git config --global user.email "github-actions@github.com"
           git config --global user.name "GitHub Actions"
 
-          git checkout -b release/${{ inputs.version }}
+          NEW_VERSION=$(./script/workflows/increment-version.sh ${{ inputs.version }})
+
+          git checkout -b release/$NEW_VERSION
 
-          npm version ${{ inputs.version }} --no-git-tag-version
+          npm version $NEW_VERSION --no-git-tag-version
           git add package.json package-lock.json
-          git commit -m "Release extension version ${{ inputs.version }}"
+          git commit -m "Release extension version $NEW_VERSION"
+
+          git push --set-upstream origin release/$NEW_VERSION
+
+          echo "new_version=$NEW_VERSION" >> $GITHUB_ENV
+      
+      - name: Update language server
+        if: ${{ inputs.update-language-server }}
+        run: |
+          npm install @actions/languageserver@latest @actions/workflow-parser@latest --workspaces=false
+          git checkout -- package.json
+          npm i
 
-          git push --set-upstream origin release/${{ inputs.version }}
+      - uses: stefanzweifel/git-auto-commit-action@3ea6ae190baf489ba007f7c92608f33ce20ef04a
+        with: 
+          branch: release/${{ env.new_version }}
+        if: ${{ inputs.update-language-server }}
 
       - name: Create PR
         run: |
@@ -47,6 +73,6 @@ jobs:
             --title "Release version ${{ env.new_version }}" \
             --body $RELEASE_NOTES \
             --base main \
-            --head release/${{ inputs.version }}
+            --head release/${{ env.new_version }}
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -15,11 +15,14 @@ function clone_repo() {
 repo_root="$(git rev-parse --show-toplevel)"
 root="$(dirname "$repo_root")"
 
+# Copy working package-lock.json to workspace
+echo "Copy lock file to workspace..."
+cp "$repo_root"/script/workspace/package-lock.json "$root"
+
 # Clone dependent repos
 echo "Cloning dependent repos..."
 clone_repo https://github.com/actions/languageservices "$root"/languageservices
 
-
 # Copy workspace files
 echo "Copying workspace files..."
 cp "$repo_root"/script/workspace/package.json "$root"

script/bootstrap

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+VERSION=$(cat package.json | jq -r '.version')
+
+MAJOR=$(echo $VERSION | cut -d. -f1) 
+MINOR=$(echo $VERSION | cut -d. -f2)
+PATCH=$(echo $VERSION | cut -d. -f3)
+
+if [ "$1" == "major" ]; then
+  MAJOR=$((MAJOR+1))
+  MINOR=0
+  PATCH=0
+elif [ "$1" == "minor" ]; then
+  MINOR=$((MINOR+1))
+  PATCH=0
+elif [ "$1" == "patch" ]; then
+  PATCH=$((PATCH+1))
+else
+  echo "Invalid version type. Use 'major', 'minor' or 'patch'"
+  exit 1
+fi
+
+NEW_VERSION="$MAJOR.$MINOR.$PATCH"
+echo $NEW_VERSION