fix: use pr branch when it's a pr

VSCodium · Sep 3, 2023 · 08ce8cf · 08ce8cf
1 parent 6e3e85c
commit 08ce8cf
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml
@@ -26,7 +26,7 @@ on:
 env:
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}-insiders
-  GITHUB_BRANCH: insider
+  GITHUB_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'insider' }}
   OS_NAME: linux
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: insider
@@ -231,7 +231,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: insider
+          ref: ${{ env.GITHUB_BRANCH }}
 
       - name: Check version
         env:

diff --git a/.github/workflows/insider-macos.yml b/.github/workflows/insider-macos.yml
@@ -26,7 +26,7 @@ on:
 env:
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}-insiders
-  GITHUB_BRANCH: insider
+  GITHUB_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'insider' }}
   OS_NAME: osx
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: insider
@@ -48,7 +48,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: insider
+          ref: ${{ env.GITHUB_BRANCH }}
 
       - name: Setup Node.js environment
         uses: actions/setup-node@v3

diff --git a/.github/workflows/insider-windows.yml b/.github/workflows/insider-windows.yml
@@ -26,7 +26,7 @@ on:
 env:
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}-insiders
-  GITHUB_BRANCH: insider
+  GITHUB_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'insider' }}
   OS_NAME: windows
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: insider

diff --git a/get_repo.sh b/get_repo.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2129
 
-set -ex
+set -e
 
 # git workaround
 if [[ "${CI_BUILD}" != "no" ]]; then
@@ -12,7 +12,6 @@ if [[ -z "${RELEASE_VERSION}" ]]; then
   if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
     if [[ "${VSCODE_LATEST}" == "yes" ]] || [[ ! -f "insider.json" ]]; then
       UPDATE_INFO=$( curl --silent --fail https://update.code.visualstudio.com/api/update/darwin/insider/0000000000000000000000000000000000000000 )
-      echo "${UPDATE_INFO}"
     else
       MS_COMMIT=$( jq -r '.commit' insider.json )
       MS_TAG=$( jq -r '.tag' insider.json )
@@ -23,9 +22,7 @@ if [[ -z "${RELEASE_VERSION}" ]]; then
 
   if [[ -z "${MS_COMMIT}" ]]; then
     MS_COMMIT=$( echo "${UPDATE_INFO}" | jq -r '.version' )
-    echo "${MS_COMMIT}"
     MS_TAG=$( echo "${UPDATE_INFO}" | jq -r '.name' )
-    echo "${MS_TAG}"
 
     if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
       MS_TAG="${MS_TAG/\-insider/}"