ソースを参照

fix: use RELEASE_VERSION for BUILD_SOURCEVERSION (#1293)

Baptiste Augrain 2 年 前
コミット
e14a115b0e
3 ファイル変更6 行追加12 行削除
  1. 1 1
      .github/workflows/insider-linux.yml
  2. 1 1
      get_repo.sh
  3. 4 10
      version.sh

+ 1 - 1
.github/workflows/insider-linux.yml

@@ -128,7 +128,7 @@ jobs:
       - name: Get version
         env:
           RELEASE_VERSION: ${{ needs.build.outputs.RELEASE_VERSION }}
-        run: echo "PACKAGE_VERSION=${RELEASE_VERSION/-*/}" >> $GITHUB_ENV
+        run: echo "PACKAGE_VERSION=${RELEASE_VERSION/-*/}" >> "${GITHUB_ENV}"
 
       - name: Publish vscodium-insiders-bin
         uses: zokugun/github-actions-aur-releaser@v1

+ 1 - 1
get_repo.sh

@@ -103,7 +103,7 @@ git checkout FETCH_HEAD
 cd ..
 
 # for GH actions
-if [[ ${GITHUB_ENV} ]]; then
+if [[ "${GITHUB_ENV}" ]]; then
   echo "MS_TAG=${MS_TAG}" >> "${GITHUB_ENV}"
   echo "MS_COMMIT=${MS_COMMIT}" >> "${GITHUB_ENV}"
   echo "RELEASE_VERSION=${RELEASE_VERSION}" >> "${GITHUB_ENV}"

+ 4 - 10
version.sh

@@ -2,24 +2,18 @@
 
 if [[ -z "${BUILD_SOURCEVERSION}" ]]; then
 
-    APP_HASH=$( git rev-parse HEAD )
-
-    cd vscode
-    VSCODE_HASH=$( git rev-parse HEAD )
-    cd ..
-
     if type -t "sha1sum" > /dev/null 2>&1; then
-      export BUILD_SOURCEVERSION=$( echo "${APP_HASH}:${VSCODE_HASH}" | sha1sum | cut -d' ' -f1 )
+      export BUILD_SOURCEVERSION=$( echo "${RELEASE_VERSION}" | sha1sum | cut -d' ' -f1 )
     else
       npm install -g checksum
 
-      export BUILD_SOURCEVERSION=$( echo "${APP_HASH}:${VSCODE_HASH}" | checksum )
+      export BUILD_SOURCEVERSION=$( echo "${RELEASE_VERSION}" | checksum )
     fi
 
     echo "BUILD_SOURCEVERSION=\"${BUILD_SOURCEVERSION}\""
 
     # for GH actions
-    if [[ $GITHUB_ENV ]]; then
-        echo "BUILD_SOURCEVERSION=$BUILD_SOURCEVERSION" >> $GITHUB_ENV
+    if [[ "${GITHUB_ENV}" ]]; then
+        echo "BUILD_SOURCEVERSION=${BUILD_SOURCEVERSION}" >> "${GITHUB_ENV}"
     fi
 fi