Fix version number

MarksonHon · Jun 19, 2024 · 74a931b · 74a931b
1 parent 5dabf03
commit 74a931b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/.github/workflows/beta_release_main.yml b/.github/workflows/beta_release_main.yml
@@ -415,11 +415,9 @@ jobs:
     - name: Check Version
       id: prep
       env:
-        REF: ${{ github.ref }}
-      shell: bash
+        REF: ${{ inputs.tag }}
       run: |
-        echo "P_DIR=$(pwd)" >> $GITHUB_OUTPUT
-        tag=$(git describe --tags $(git rev-list --tags --max-count=1))
+        tag=${{ inputs.tag }}
         version=${tag:1}
         echo "VERSION=$version" >> $GITHUB_OUTPUT
         echo "VERSION=$version" >> $GITHUB_ENV

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -81,4 +81,4 @@ jobs:
     - name: Upload Zip File to Artifacts
       uses: nanoufo/action-upload-artifacts-and-release-assets@v2
       with:
-        path: v2raya_bin/*
+        path: v2raya_bin/*
diff --git a/.github/workflows/release_main.yml b/.github/workflows/release_main.yml
@@ -60,7 +60,8 @@ jobs:
       env:
         REF: ${{ inputs.tag }}
       run: |
-        version=${REF}
+        tag=${{ inputs.tag }}
+        version=${tag:1}
         echo "VERSION=$version" >> $GITHUB_OUTPUT
         echo "VERSION=$version" >> $GITHUB_ENV
     - name: Set up Go
@@ -149,7 +150,8 @@ jobs:
       env:
         REF: ${{ inputs.tag }}
       run: |
-        version=${REF}
+        tag=${{ inputs.tag }}
+        version=${tag:1}
         echo "VERSION=$version" >> $GITHUB_OUTPUT
         echo "VERSION=$version" >> $GITHUB_ENV
     - name: Set up Go
@@ -204,7 +206,7 @@ jobs:
       env:
         REF: ${{ inputs.tag }}
       run: |
-        version=${REF}
+        version=${{ inputs.tag }}
         echo "VERSION=$version" >> $GITHUB_OUTPUT
         echo "VERSION=$version" >> $GITHUB_ENV
     - name: Download Artifact Windows x64
@@ -877,7 +879,8 @@ jobs:
       env:
         REF: ${{ inputs.tag }}
       run: |
-        version=${REF}
+        tag=${{ inputs.tag }}
+        version=${tag:1}
         echo "VERSION=$version" >> $GITHUB_OUTPUT
         echo "VERSION=$version" >> $GITHUB_ENV
     - name: Submit to Microsoft winget

diff --git a/.github/workflows/test_build_main.yml b/.github/workflows/test_build_main.yml
@@ -57,10 +57,12 @@ jobs:
         path: service/server/router/web
     - name: Check Version
       id: prep
-      env:
-        REF: ${{ inputs.tag }}
       run: |
-        version=${REF}
+        echo "P_DIR=$(pwd)" >> $GITHUB_OUTPUT
+        date=$(git log -1 --format="%cd" --date=short | sed s/-//g)
+        count=$(git rev-list --count HEAD)
+        commit=$(git rev-parse --short HEAD)
+        version="unstable-$date.r${count}.$commit"
         echo "VERSION=$version" >> $GITHUB_OUTPUT
         echo "VERSION=$version" >> $GITHUB_ENV
     - name: Set up Go
@@ -146,10 +148,12 @@ jobs:
         path: service/server/router/web
     - name: Check Version
       id: prep
-      env:
-        REF: ${{ inputs.tag }}
       run: |
-        version=${REF}
+        echo "P_DIR=$(pwd)" >> $GITHUB_OUTPUT
+        date=$(git log -1 --format="%cd" --date=short | sed s/-//g)
+        count=$(git rev-list --count HEAD)
+        commit=$(git rev-parse --short HEAD)
+        version="unstable-$date.r${count}.$commit"
         echo "VERSION=$version" >> $GITHUB_OUTPUT
         echo "VERSION=$version" >> $GITHUB_ENV
     - name: Set up Go