2
0
Эх сурвалжийг харах

fix: correctly read exit status (#914)

Baptiste Augrain 3 жил өмнө
parent
commit
23313d41ba

+ 1 - 1
.github/workflows/macos.yml

@@ -95,7 +95,7 @@ jobs:
 
       - name: Release
         env:
-          GH_CLI_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: ./release.sh
         if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 

+ 1 - 1
.github/workflows/windows.yml

@@ -82,7 +82,7 @@ jobs:
 
       - name: Release
         env:
-          GH_CLI_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: ./release.sh
         if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 

+ 5 - 3
release.sh

@@ -22,9 +22,9 @@ for FILE in *
 do
   if [[ -f "${FILE}" ]] && [[ "${FILE}" != *.sha1 ]] && [[ "${FILE}" != *.sha256 ]]; then
     echo "Uploading '${FILE}' at $( date "+%T" )"
-    EXIT_STATUS=$( gh release upload "${MS_TAG}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256" )
+    gh release upload "${MS_TAG}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256"
 
-    if ! (( $EXIT_STATUS )); then
+    if ! (( $? )); then
       for (( i=0; i<10; i++ ))
       do
         github-release delete --owner VSCodium --repo vscodium --tag "${MS_TAG}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256"
@@ -32,7 +32,9 @@ do
         sleep $(( 15 * (i + 1)))
 
         echo "RE-Uploading '${FILE}' at $( date "+%T" )"
-        EXIT_STATUS=$( gh release upload "${MS_TAG}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256" )
+        gh release upload "${MS_TAG}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256"
+
+        EXIT_STATUS=$?
         echo "exit: $EXIT_STATUS"
 
         if ! (( $EXIT_STATUS )); then