Skip to content

Commit c8366ab

Browse files
authored
Update GitHub Actions workflows. (#608)
This PR was automatically generated by the update-workflows-ecosystem-providers workflow in the pulumi/ci-mgmt repo, from commit e7696dfaff0baa5b84126fc6971cc40e89d490cf.
1 parent d25f42d commit c8366ab

File tree

10 files changed

+50
-11
lines changed

10 files changed

+50
-11
lines changed
Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
1-
name: Download binary assets
2-
description: Downloads the provider and tfgen binaries to `bin/`.
1+
name: Download the provider binary
2+
description: Downloads the provider binary to `bin/`.
33

44
runs:
55
using: "composite"
66
steps:
7-
- name: Download provider + tfgen binaries
7+
8+
- name: Download pulumi-resource-postgresql
89
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
910
with:
10-
name: postgresql-provider.tar.gz
11+
pattern: pulumi-resource-postgresql-*-linux-amd64.tar.gz
1112
path: ${{ github.workspace }}/bin
12-
- name: Untar provider binaries
13+
merge-multiple: true
14+
15+
- name: Untar pulumi-resource-postgresql
16+
shell: bash
17+
run: |
18+
tar -zxf ${{ github.workspace }}/bin/*amd64.tar.gz -C ${{ github.workspace}}/bin
19+
20+
- name: Mark pulumi-resource-postgresql as executable
1321
shell: bash
1422
run: |
15-
tar -zxf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ github.workspace}}/bin
1623
find ${{ github.workspace }} -name "pulumi-*-postgresql" -print -exec chmod +x {} \;
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Download the tfgen binary
2+
description: Downloads the tfgen binary to `bin/`.
3+
4+
runs:
5+
using: "composite"
6+
steps:
7+
8+
- name: Download pulumi-tfgen-postgresql
9+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
10+
with:
11+
name: pulumi-tfgen-postgresql
12+
path: ${{ github.workspace }}/bin
13+
14+
- name: Ensure pulumi-tfgen-postgresql is executable
15+
shell: bash
16+
run: |
17+
find ${{ github.workspace }} -name "pulumi-*-postgresql" -print -exec chmod +x {} \;

.github/workflows/build_provider.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
env:
1616
PROVIDER_VERSION: ${{ inputs.version }}
17+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1718
strategy:
1819
fail-fast: true
1920
matrix:

.github/workflows/build_sdk.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ jobs:
5656
tools: pulumictl, pulumicli, ${{ matrix.language }}
5757
- name: Prepare local workspace
5858
run: make prepare_local_workspace
59-
- name: Download bin
60-
uses: ./.github/actions/download-bin
59+
- name: Download tfgen
60+
uses: ./.github/actions/download-tfgen
6161
- name: Update path
6262
run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
6363
- name: Restore makefile progress

.github/workflows/master.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ jobs:
129129
name: test
130130
needs:
131131
- prerequisites
132+
- build_provider
132133
- build_sdk
133134
permissions:
134135
contents: read

.github/workflows/prerelease.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ jobs:
7070
name: test
7171
needs:
7272
- prerequisites
73+
- build_provider
7374
- build_sdk
7475
permissions:
7576
contents: read

.github/workflows/prerequisites.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,12 @@ jobs:
9191
9292
Maintainer note: consult the [runbook](https://github.com/pulumi/platform-providers-team/blob/main/playbooks/tf-provider-updating.md) for dealing with any breaking changes.
9393
94-
- name: Upload bin
95-
uses: ./.github/actions/upload-bin
94+
- name: Upload pulumi-tfgen-postgresql
95+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
96+
with:
97+
name: pulumi-tfgen-postgresql
98+
path: ${{ github.workspace }}/bin/pulumi-tfgen-postgresql
99+
retention-days: 30
96100

97101
- name: Upload schema-embed.json
98102
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ jobs:
7676
name: test
7777
needs:
7878
- prerequisites
79+
- build_provider
7980
- build_sdk
8081
permissions:
8182
contents: read

.github/workflows/run-acceptance-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ jobs:
118118
name: test
119119
needs:
120120
- prerequisites
121+
- build_provider
121122
- build_sdk
122123
permissions:
123124
contents: read

upstream.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,14 @@ apply_patches() {
138138
# Iterating over the patches folder in sorted order,
139139
# apply the patch using a 3-way merge strategy. This mirrors the default behavior of 'git merge'
140140
cd upstream
141+
# Allow directory to be empty
142+
shopt -s nullglob
141143
for patch in ../patches/*.patch; do
142144
if ! git apply --3way "${patch}" --allow-empty; then
143145
err_failed_to_apply "$(basename "${patch}")"
144146
fi
145147
done
148+
shopt -u nullglob
146149
}
147150

148151
clean_rebases() {
@@ -227,13 +230,16 @@ checkout() {
227230
# Create a new branch 'pulumi/patch-checkout' which will contain the commits for each patch
228231
git checkout -B pulumi/patch-checkout
229232

233+
# Allow directory to be empty
234+
shopt -s nullglob
230235
for patch in ../patches/*.patch; do
231236
if ! git am --3way "${patch}"; then
232237
err_failed_to_apply "$(basename "${patch}")"
233238
fi
234239
done
240+
shopt -u nullglob
235241

236-
cat <<EOF
242+
cat <<EOF
237243
238244
The patches have been checked out as commits in the './upstream' repository.
239245
The 'pulumi/patch-checkout' branch is pointing to the last patch.

0 commit comments

Comments
 (0)