check out ci-scripts one level up on the filesystem

Since pulumi/scripts#141, check-worktree-is-clean also checks for untracked files in the repository. However that means that it will also recognize its own folder existing at the same level as the repository as an unclean worktree. Fix that by checking the scripts out one level higher, so they are not in the same directory as the repository.
pulumi · May 10, 2024 · 486d5a3 · 486d5a3
1 parent 613831c
commit 486d5a3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -95,7 +95,7 @@ jobs:
       - name: Checkout Scripts Repo
         uses: actions/checkout@v2
         with:
-          path: ci-scripts
+          path: ../ci-scripts
           repository: pulumi/scripts
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
@@ -109,7 +109,7 @@ jobs:
       - name: Build SDK
         run: make only_build
       - name: Check worktree clean
-        run: ./ci-scripts/ci/check-worktree-is-clean
+        run: ../ci-scripts/ci/check-worktree-is-clean
       - name: Run Unit Tests
         run: make only_test_fast
       - name: Run Integration Tests
@@ -118,7 +118,7 @@ jobs:
         run: make publish_packages
       - name: Trigger Docs Build
         run: |
-          ./ci-scripts/ci/build-package-docs.sh "policy"
+          ../ci-scripts/ci/build-package-docs.sh "policy"
         env:
           TRAVIS: true
           PULUMI_BOT_GITHUB_API_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -95,12 +95,12 @@ jobs:
       - name: Checkout Scripts Repo
         uses: actions/checkout@v2
         with:
-          path: ci-scripts
+          path: ../ci-scripts
           repository: pulumi/scripts
       - name: Build SDK
         run: make only_build
       - name: Check worktree clean
-        run: ./ci-scripts/ci/check-worktree-is-clean
+        run: ../ci-scripts/ci/check-worktree-is-clean
       - name: Run Unit Tests
         run: make only_test_fast
       - name: Run Integration Tests
@@ -109,7 +109,7 @@ jobs:
         run: make publish_packages
       - name: Trigger Docs Build
         run: |
-          ./ci-scripts/ci/build-package-docs.sh "policy"
+          ../ci-scripts/ci/build-package-docs.sh "policy"
         env:
           TRAVIS: true
           PULUMI_BOT_GITHUB_API_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }}

diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml
@@ -111,12 +111,12 @@ jobs:
       - name: Checkout Scripts Repo
         uses: actions/checkout@v2
         with:
-          path: ci-scripts
+          path: ../ci-scripts
           repository: pulumi/scripts
       - name: Build SDK
         run: make only_build
       - name: Check worktree clean
-        run: ./ci-scripts/ci/check-worktree-is-clean
+        run: ../ci-scripts/ci/check-worktree-is-clean
       - name: Run Unit Tests
         run: make only_test_fast
       - name: Run Integration Tests