Ordering change from pulumi/ci-mgmt@0e7a98d

pulumi · Aug 25, 2023 · e2179ed · e2179ed
1 parent 76d843c
commit e2179ed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml
@@ -156,8 +156,8 @@ jobs:
     - name: Checkout Repo
       uses: actions/checkout@v3
       with:
-        submodules: true
         ref: ${{ env.PR_COMMIT_SHA }}
+        submodules: true
     - name: Checkout Scripts Repo
       uses: actions/checkout@v3
       with:
@@ -259,8 +259,8 @@ jobs:
     - name: Checkout Repo
       uses: actions/checkout@v3
       with:
-        submodules: true
         ref: ${{ env.PR_COMMIT_SHA }}
+        submodules: true
     - name: Checkout Scripts Repo
       uses: actions/checkout@v3
       with:

diff --git a/scripts/upstream.sh b/scripts/upstream.sh
@@ -86,7 +86,11 @@ start_rebase() {
   fi
 
   git branch -f local
-  git checkout -B pulumi-patch "${FROM}"
+  if [ -n "$FROM" ]; then
+     git checkout -B pulumi-patch "$FROM"
+  else
+     git checkout -B pulumi-patch
+  fi
   git branch --set-upstream-to=local pulumi-patch
 
   for patch in ../patches/*.patch; do