From 03148eae8642e16be170b4af1316577bc0c9832d Mon Sep 17 00:00:00 2001
From: Pavel <Pavel.Murygin@gmail.com>
Date: Tue, 25 May 2021 12:51:51 +0300
Subject: [PATCH] Fix version calculation (#4)

Fix version calculation
---
 .github/workflows/vscode_highlight.yml | 28 +++++++++-----------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/vscode_highlight.yml b/.github/workflows/vscode_highlight.yml
index 7133d6f..cc90be8 100644
--- a/.github/workflows/vscode_highlight.yml
+++ b/.github/workflows/vscode_highlight.yml
@@ -5,8 +5,8 @@ on:
     # uncomment to release only on tags starting with 'v'
     # tags:
     #   - "v*"
-    branches:
-      - "main"
+    #branches:
+    #  - "main"
 
   workflow_dispatch:
 
@@ -39,24 +39,13 @@ jobs:
       - name: Get version from npm and increment
         run: |
           cd vscode-highlight
-          PATH="$(yarn global bin):$PATH"
-          yarn global add semver
-
-          # take npm version and increment it
+          VERSION="1.0.${{ github.run_number }}"
           PKG_NAME="$(cat package.json | jq -r .name)"
-          NPM_VERSION="$(yarn info --silent "$PKG_NAME" version || true)"
-          NEXT_NPM_VERSION="$(semver --increment patch "$NPM_VERSION")"
-          
-          # take local version
-          LOCAL_VERSION="$(cat package.json | jq -r .version)"
-
-          # take maximum of the local and NEXT_NPM versions
-          MAX_VERSION="$(semver "$LOCAL_VERSION" "$NEXT_NPM_VERSION" "0.0.0" | tail -n1)"
 
           # save info to env
-          echo "FINAL_VERSION=$MAX_VERSION" | tee -a $GITHUB_ENV
+          echo "FINAL_VERSION=$VERSION" | tee -a $GITHUB_ENV
           echo "PKG_NAME=$PKG_NAME" | tee -a $GITHUB_ENV
-          echo "PKG_FILE=vscode-highlight/${PKG_NAME}-${MAX_VERSION}.vsix" | tee -a $GITHUB_ENV
+          echo "PKG_FILE=vscode-highlight/${PKG_NAME}-${VERSION}.vsix" | tee -a $GITHUB_ENV
 
       ### Set version
       - name: Set version to ${{ env.FINAL_VERSION }}
@@ -69,7 +58,8 @@ jobs:
         with:
           node-version: "15"
           registry-url: "https://registry.npmjs.org"
-      - run: |
+      - name: build package
+        run: |
           cd vscode-highlight
           npm i -g vsce
           vsce package
@@ -85,6 +75,6 @@ jobs:
             Version: ${{ env.FINAL_VERSION }}
           files: |
             ${{ env.PKG_FILE }}
-          draft: false
-          prerelease: true
+          draft: true
+          prerelease: false