From 6901fa21f49d5b1c91a520a1e7535977312d1385 Mon Sep 17 00:00:00 2001
From: Bryce Lampe <bryce@pulumi.com>
Date: Tue, 17 Dec 2024 11:54:43 -0800
Subject: [PATCH] Remove `make upstream` from `preTest`

After https://github.com/pulumi/ci-mgmt/pull/1151 our `make` targets
should now all correctly call `make upstream` if they need it.

This updates `.ci-mgmt.yaml` and re-runs `make ci-mgmt`.
---
 .ci-mgmt.yaml                              | 3 ---
 .github/workflows/master.yml               | 3 +++
 .github/workflows/nightly-test.yml         | 3 +++
 .github/workflows/prerelease.yml           | 3 +++
 .github/workflows/release.yml              | 3 +++
 .github/workflows/run-acceptance-tests.yml | 3 +++
 .github/workflows/test.yml                 | 3 ---
 7 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.ci-mgmt.yaml b/.ci-mgmt.yaml
index 4f38b52add..11cbc91400 100644
--- a/.ci-mgmt.yaml
+++ b/.ci-mgmt.yaml
@@ -45,9 +45,6 @@ plugins:
 goBuildParallelism: 2
 actions:
   preTest:
-    - name: make upstream
-      run: |
-        make upstream
     - name: Run provider tests
       run: |
         cd provider && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 3d7bbfb4c3..78f042e4c3 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -138,6 +138,9 @@ jobs:
       - prerequisites
       - build_provider
       - build_sdk
+    permissions:
+      contents: read
+      id-token: write
     secrets: inherit
     with:
       version: ${{ needs.prerequisites.outputs.version }}
diff --git a/.github/workflows/nightly-test.yml b/.github/workflows/nightly-test.yml
index 1952b99adb..37cb82404e 100644
--- a/.github/workflows/nightly-test.yml
+++ b/.github/workflows/nightly-test.yml
@@ -54,6 +54,9 @@ jobs:
       - prerequisites
       - build_provider
       - build_sdk
+    permissions:
+      contents: read
+      id-token: write
     secrets: inherit
     with:
       version: ${{ needs.prerequisites.outputs.version }}
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index 5d586f0bed..b202f8074b 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -79,6 +79,9 @@ jobs:
       - prerequisites
       - build_provider
       - build_sdk
+    permissions:
+      contents: read
+      id-token: write
     secrets: inherit
     with:
       version: ${{ needs.prerequisites.outputs.version }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 017665470b..e265503d73 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -85,6 +85,9 @@ jobs:
       - prerequisites
       - build_provider
       - build_sdk
+    permissions:
+      contents: read
+      id-token: write
     secrets: inherit
     with:
       version: ${{ needs.prerequisites.outputs.version }}
diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml
index fdb119e816..a34f889230 100644
--- a/.github/workflows/run-acceptance-tests.yml
+++ b/.github/workflows/run-acceptance-tests.yml
@@ -128,6 +128,9 @@ jobs:
       - prerequisites
       - build_provider
       - build_sdk
+    permissions:
+      contents: read
+      id-token: write
     secrets: inherit
     with:
       version: ${{ needs.prerequisites.outputs.version }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9f5e91e0f7..f2600c27f5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -91,9 +91,6 @@ jobs:
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         version: v2.5.0
-    - name: make upstream
-      run: |
-        make upstream
     - name: Run provider tests
       run: |
         cd provider && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt