-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into test-image-args
- Loading branch information
Showing
4 changed files
with
160 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -111,6 +111,7 @@ jobs: | |
| - name: Build Provider | ||
| run: make provider | ||
| - name: Check worktree clean | ||
| id: worktreeClean | ||
| uses: pulumi/git-status-check-action@54000b91124a8dd9fd6a872cb41f5dd246a46e7c # v1.1.1 | ||
| with: | ||
| allowed-changes: |- | ||
|
|
@@ -217,6 +218,7 @@ jobs: | |
| - name: Build SDK | ||
| run: make build_${{ matrix.language }} | ||
| - name: Check worktree clean | ||
| id: worktreeClean | ||
| uses: pulumi/git-status-check-action@54000b91124a8dd9fd6a872cb41f5dd246a46e7c # v1.1.1 | ||
| with: | ||
| allowed-changes: |- | ||
|
|
@@ -225,6 +227,44 @@ jobs: | |
| sdk/go/**/pulumiUtilities.go | ||
| sdk/nodejs/package.json | ||
| sdk/python/pyproject.toml | ||
| - name: Commit ${{ matrix.language }} SDK changes for Renovate | ||
| if: failure() && steps.worktreeClean.outcome == 'failure' && | ||
| contains(github.actor, 'renovate') | ||
| shell: bash | ||
| run: > | ||
| git config --global user.email "[email protected]" | ||
| git config --global user.name "pulumi-bot" | ||
| # Stash local changes and check out the PR's branch directly. | ||
| git stash | ||
| git fetch | ||
| git checkout "origin/$HEAD_REF" | ||
| # Apply and add our changes, but don't commit any files we expect to | ||
| # always change due to versioning. | ||
| git stash pop | ||
| git add sdk | ||
| git reset sdk/python/*/pulumi-plugin.json sdk/dotnet/Pulumi.*.csproj sdk/go/*/internal/pulumiUtilities.go sdk/nodejs/package.json sdk/python/pyproject.toml | ||
| git commit -m 'Commit ${{ matrix.language }} SDK for Renovate' | ||
| # Push with pulumi-bot credentials to trigger a re-run of the | ||
| # workflow. https://github.com/orgs/community/discussions/25702 | ||
| git push https://pulumi-bot:${{ secrets.PULUMI_BOT_TOKEN }}@github.com/${{ github.repository }} "HEAD:$HEAD_REF" | ||
| env: | ||
| HEAD_REF: ${{ github.head_ref }} | ||
| - run: git status --porcelain | ||
| - name: Tar SDK folder | ||
| run: tar -zcf sdk/${{ matrix.language }}.tar.gz -C sdk/${{ matrix.language }} . | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -103,6 +103,7 @@ jobs: | |
| - name: Build Provider | ||
| run: make provider | ||
| - name: Check worktree clean | ||
| id: worktreeClean | ||
| uses: pulumi/git-status-check-action@54000b91124a8dd9fd6a872cb41f5dd246a46e7c # v1.1.1 | ||
| with: | ||
| allowed-changes: |- | ||
|
|
@@ -209,6 +210,7 @@ jobs: | |
| - name: Build SDK | ||
| run: make build_${{ matrix.language }} | ||
| - name: Check worktree clean | ||
| id: worktreeClean | ||
| uses: pulumi/git-status-check-action@54000b91124a8dd9fd6a872cb41f5dd246a46e7c # v1.1.1 | ||
| with: | ||
| allowed-changes: |- | ||
|
|
@@ -217,6 +219,44 @@ jobs: | |
| sdk/go/**/pulumiUtilities.go | ||
| sdk/nodejs/package.json | ||
| sdk/python/pyproject.toml | ||
| - name: Commit ${{ matrix.language }} SDK changes for Renovate | ||
| if: failure() && steps.worktreeClean.outcome == 'failure' && | ||
| contains(github.actor, 'renovate') | ||
| shell: bash | ||
| run: > | ||
| git config --global user.email "[email protected]" | ||
| git config --global user.name "pulumi-bot" | ||
| # Stash local changes and check out the PR's branch directly. | ||
| git stash | ||
| git fetch | ||
| git checkout "origin/$HEAD_REF" | ||
| # Apply and add our changes, but don't commit any files we expect to | ||
| # always change due to versioning. | ||
| git stash pop | ||
| git add sdk | ||
| git reset sdk/python/*/pulumi-plugin.json sdk/dotnet/Pulumi.*.csproj sdk/go/*/internal/pulumiUtilities.go sdk/nodejs/package.json sdk/python/pyproject.toml | ||
| git commit -m 'Commit ${{ matrix.language }} SDK for Renovate' | ||
| # Push with pulumi-bot credentials to trigger a re-run of the | ||
| # workflow. https://github.com/orgs/community/discussions/25702 | ||
| git push https://pulumi-bot:${{ secrets.PULUMI_BOT_TOKEN }}@github.com/${{ github.repository }} "HEAD:$HEAD_REF" | ||
| env: | ||
| HEAD_REF: ${{ github.head_ref }} | ||
| - run: git status --porcelain | ||
| - name: Tar SDK folder | ||
| run: tar -zcf sdk/${{ matrix.language }}.tar.gz -C sdk/${{ matrix.language }} . | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -103,6 +103,7 @@ jobs: | |
| - name: Build Provider | ||
| run: make provider | ||
| - name: Check worktree clean | ||
| id: worktreeClean | ||
| uses: pulumi/git-status-check-action@54000b91124a8dd9fd6a872cb41f5dd246a46e7c # v1.1.1 | ||
| with: | ||
| allowed-changes: |- | ||
|
|
@@ -209,6 +210,7 @@ jobs: | |
| - name: Build SDK | ||
| run: make build_${{ matrix.language }} | ||
| - name: Check worktree clean | ||
| id: worktreeClean | ||
| uses: pulumi/git-status-check-action@54000b91124a8dd9fd6a872cb41f5dd246a46e7c # v1.1.1 | ||
| with: | ||
| allowed-changes: |- | ||
|
|
@@ -217,6 +219,44 @@ jobs: | |
| sdk/go/**/pulumiUtilities.go | ||
| sdk/nodejs/package.json | ||
| sdk/python/pyproject.toml | ||
| - name: Commit ${{ matrix.language }} SDK changes for Renovate | ||
| if: failure() && steps.worktreeClean.outcome == 'failure' && | ||
| contains(github.actor, 'renovate') | ||
| shell: bash | ||
| run: > | ||
| git config --global user.email "[email protected]" | ||
| git config --global user.name "pulumi-bot" | ||
| # Stash local changes and check out the PR's branch directly. | ||
| git stash | ||
| git fetch | ||
| git checkout "origin/$HEAD_REF" | ||
| # Apply and add our changes, but don't commit any files we expect to | ||
| # always change due to versioning. | ||
| git stash pop | ||
| git add sdk | ||
| git reset sdk/python/*/pulumi-plugin.json sdk/dotnet/Pulumi.*.csproj sdk/go/*/internal/pulumiUtilities.go sdk/nodejs/package.json sdk/python/pyproject.toml | ||
| git commit -m 'Commit ${{ matrix.language }} SDK for Renovate' | ||
| # Push with pulumi-bot credentials to trigger a re-run of the | ||
| # workflow. https://github.com/orgs/community/discussions/25702 | ||
| git push https://pulumi-bot:${{ secrets.PULUMI_BOT_TOKEN }}@github.com/${{ github.repository }} "HEAD:$HEAD_REF" | ||
| env: | ||
| HEAD_REF: ${{ github.head_ref }} | ||
| - run: git status --porcelain | ||
| - name: Tar SDK folder | ||
| run: tar -zcf sdk/${{ matrix.language }}.tar.gz -C sdk/${{ matrix.language }} . | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -125,6 +125,7 @@ jobs: | |
| - name: Build Provider | ||
| run: make provider | ||
| - name: Check worktree clean | ||
| id: worktreeClean | ||
| uses: pulumi/git-status-check-action@54000b91124a8dd9fd6a872cb41f5dd246a46e7c # v1.1.1 | ||
| with: | ||
| allowed-changes: |- | ||
|
|
@@ -234,6 +235,7 @@ jobs: | |
| - name: Build SDK | ||
| run: make build_${{ matrix.language }} | ||
| - name: Check worktree clean | ||
| id: worktreeClean | ||
| uses: pulumi/git-status-check-action@54000b91124a8dd9fd6a872cb41f5dd246a46e7c # v1.1.1 | ||
| with: | ||
| allowed-changes: |- | ||
|
|
@@ -242,6 +244,44 @@ jobs: | |
| sdk/go/**/pulumiUtilities.go | ||
| sdk/nodejs/package.json | ||
| sdk/python/pyproject.toml | ||
| - name: Commit ${{ matrix.language }} SDK changes for Renovate | ||
| if: failure() && steps.worktreeClean.outcome == 'failure' && | ||
| contains(github.actor, 'renovate') | ||
| shell: bash | ||
| run: > | ||
| git config --global user.email "[email protected]" | ||
| git config --global user.name "pulumi-bot" | ||
| # Stash local changes and check out the PR's branch directly. | ||
| git stash | ||
| git fetch | ||
| git checkout "origin/$HEAD_REF" | ||
| # Apply and add our changes, but don't commit any files we expect to | ||
| # always change due to versioning. | ||
| git stash pop | ||
| git add sdk | ||
| git reset sdk/python/*/pulumi-plugin.json sdk/dotnet/Pulumi.*.csproj sdk/go/*/internal/pulumiUtilities.go sdk/nodejs/package.json sdk/python/pyproject.toml | ||
| git commit -m 'Commit ${{ matrix.language }} SDK for Renovate' | ||
| # Push with pulumi-bot credentials to trigger a re-run of the | ||
| # workflow. https://github.com/orgs/community/discussions/25702 | ||
| git push https://pulumi-bot:${{ secrets.PULUMI_BOT_TOKEN }}@github.com/${{ github.repository }} "HEAD:$HEAD_REF" | ||
| env: | ||
| HEAD_REF: ${{ github.head_ref }} | ||
| - run: git status --porcelain | ||
| - name: Tar SDK folder | ||
| run: tar -zcf sdk/${{ matrix.language }}.tar.gz -C sdk/${{ matrix.language }} . | ||
|
|
||