From 0dc048d859286e16c5fd47bc3ab712792c470f1e Mon Sep 17 00:00:00 2001
From: Pulumi Bot <30351955+pulumi-bot@users.noreply.github.com>
Date: Mon, 24 Jun 2024 23:05:04 -0700
Subject: [PATCH] Update GitHub Actions workflows. (#580)

This PR was automatically generated by the
update-workflows-ecosystem-providers workflow in the pulumi/ci-mgmt
repo, from commit f9903f875739e7dd80b220b5ddeb3eadf556b417.
---
 .github/workflows/build_sdk.yml            |  7 -------
 .github/workflows/lint.yml                 |  7 -------
 .github/workflows/master.yml               | 15 +--------------
 .github/workflows/prerelease.yml           | 14 --------------
 .github/workflows/prerequisites.yml        |  7 -------
 .github/workflows/release.yml              | 14 --------------
 .github/workflows/run-acceptance-tests.yml |  7 -------
 scripts/upstream.sh                        |  2 +-
 8 files changed, 2 insertions(+), 71 deletions(-)

diff --git a/.github/workflows/build_sdk.yml b/.github/workflows/build_sdk.yml
index 16432b70b..77c27d4a7 100644
--- a/.github/workflows/build_sdk.yml
+++ b/.github/workflows/build_sdk.yml
@@ -89,10 +89,3 @@ jobs:
           name: ${{ matrix.language  }}-sdk.tar.gz
           path: ${{ github.workspace}}/sdk/${{ matrix.language }}.tar.gz
           retention-days: 30
-      - if: failure() && github.event_name == 'push'
-        name: Notify Slack
-        uses: 8398a7/action-slack@v3
-        with:
-          author_name: Failure in building ${{ matrix.language }} sdk
-          fields: repo,commit,author,action
-          status: ${{ job.status }}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index ca9ead9e5..b4daa05b8 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -53,10 +53,3 @@ jobs:
       with:
         version: v1.58.0
         working-directory: provider
-    - if: failure() && github.event_name == 'push'
-      name: Notify Slack
-      uses: 8398a7/action-slack@v3
-      with:
-        author_name: Failure in linting provider
-        fields: repo,commit,author,action
-        status: ${{ job.status }}
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index c7c2bf9b6..debf2fb61 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -147,13 +147,7 @@ jobs:
         args: -p 3 -f .goreleaser.prerelease.yml --rm-dist --skip-validate --timeout
           60m0s
         version: latest
-    - if: failure() && github.event_name == 'push'
-      name: Notify Slack
-      uses: 8398a7/action-slack@v3
-      with:
-        author_name: Failure in publishing binaries
-        fields: repo,commit,author,action
-        status: ${{ job.status }}
+
   publish_sdk:
     name: publish_sdk
     needs:
@@ -293,13 +287,6 @@ jobs:
     - name: Run tests
       run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{
         matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt
-    - if: failure() && github.event_name == 'push'
-      name: Notify Slack
-      uses: 8398a7/action-slack@v3
-      with:
-        author_name: Failure in running ${{ matrix.language }} tests
-        fields: repo,commit,author,action
-        status: ${{ job.status }}
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index a0934303a..eeee974f7 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -94,13 +94,6 @@ jobs:
         args: -p 3 -f .goreleaser.prerelease.yml --rm-dist --skip-validate --timeout
           60m0s
         version: latest
-    - if: failure() && github.event_name == 'push'
-      name: Notify Slack
-      uses: 8398a7/action-slack@v3
-      with:
-        author_name: Failure in publishing binaries
-        fields: repo,commit,author,action
-        status: ${{ job.status }}
   publish_sdk:
     name: publish_sdk
     needs: 
@@ -258,13 +251,6 @@ jobs:
     - name: Run tests
       run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{
         matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt
-    - if: failure() && github.event_name == 'push'
-      name: Notify Slack
-      uses: 8398a7/action-slack@v3
-      with:
-        author_name: Failure in running ${{ matrix.language }} tests
-        fields: repo,commit,author,action
-        status: ${{ job.status }}
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/prerequisites.yml b/.github/workflows/prerequisites.yml
index e1a38d5b9..e1d9f7b11 100644
--- a/.github/workflows/prerequisites.yml
+++ b/.github/workflows/prerequisites.yml
@@ -104,10 +104,3 @@ jobs:
         name: datadog-provider.tar.gz
         path: ${{ github.workspace }}/bin/provider.tar.gz
         retention-days: 30
-    - if: failure() && inputs.is_pr
-      name: Notify Slack
-      uses: 8398a7/action-slack@v3
-      with:
-        author_name: Failure in building provider prerequisites
-        fields: repo,commit,author,action
-        status: ${{ job.status }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 87d5f9c1f..b6a9a557b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -109,13 +109,6 @@ jobs:
       with:
         args: -p 3 release --rm-dist --timeout 60m0s
         version: latest
-    - if: failure() && github.event_name == 'push'
-      name: Notify Slack
-      uses: 8398a7/action-slack@v3
-      with:
-        author_name: Failure in publishing binaries
-        fields: repo,commit,author,action
-        status: ${{ job.status }}
   publish_sdk:
     name: publish_sdk
     needs:
@@ -291,13 +284,6 @@ jobs:
     - name: Run tests
       run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{
         matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt
-    - if: failure() && github.event_name == 'push'
-      name: Notify Slack
-      uses: 8398a7/action-slack@v3
-      with:
-        author_name: Failure in running ${{ matrix.language }} tests
-        fields: repo,commit,author,action
-        status: ${{ job.status }}
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml
index f2e86795a..113bc2211 100644
--- a/.github/workflows/run-acceptance-tests.yml
+++ b/.github/workflows/run-acceptance-tests.yml
@@ -154,13 +154,6 @@ jobs:
       if: matrix.testTarget == 'local'
       run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{
         matrix.language }} -skip TestPulumiExamples -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt
-    - if: failure() && github.event_name == 'push' && matrix.testTarget == 'local'
-      name: Notify Slack
-      uses: 8398a7/action-slack@v3
-      with:
-        author_name: Failure in running ${{ matrix.language }} tests
-        fields: repo,commit,author,action
-        status: ${{ job.status }}
     - name: Run pulumi/examples tests
       if: matrix.testTarget == 'pulumiExamples'
       run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{
diff --git a/scripts/upstream.sh b/scripts/upstream.sh
index fdbdecbec..d35932e0e 100755
--- a/scripts/upstream.sh
+++ b/scripts/upstream.sh
@@ -91,7 +91,7 @@ start_rebase() {
 
   for patch in ../patches/*.patch; do
     echo "Applying $patch"
-    if ! git am --3way "$patch" --allow-empty; then
+    if ! git am --3way "$patch"; then
       echo
       echo "Failed to apply ${patch}. Please run 'make upstream.rebase FROM=$TAG' where '$TAG' allows the patch set to apply cleanly"
       echo