From 486d5a3c8e3cf6d6b9ae1ced0c4f7b24577c0f6c Mon Sep 17 00:00:00 2001
From: Thomas Gummerer <t.gummerer@gmail.com>
Date: Fri, 10 May 2024 14:03:55 +0200
Subject: [PATCH] check out ci-scripts one level up on the filesystem

Since https://github.com/pulumi/scripts/pull/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.
---
 .github/workflows/master.yml               | 6 +++---
 .github/workflows/release.yml              | 6 +++---
 .github/workflows/run-acceptance-tests.yml | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 6e081e2..4baa216 100644
--- 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
index c35a9e1..9cbb517 100644
--- 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
index 73dda4f..3f88861 100644
--- 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