Skip to content

Commit 2651334

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

File tree

10 files changed

+50
-11
lines changed

10 files changed

+50
-11
lines changed
+13-6
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-keycloak
89
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
910
with:
10-
name: keycloak-provider.tar.gz
11+
pattern: pulumi-resource-keycloak-*-linux-amd64.tar.gz
1112
path: ${{ github.workspace }}/bin
12-
- name: Untar provider binaries
13+
merge-multiple: true
14+
15+
- name: Untar pulumi-resource-keycloak
16+
shell: bash
17+
run: |
18+
tar -zxf ${{ github.workspace }}/bin/*amd64.tar.gz -C ${{ github.workspace}}/bin
19+
20+
- name: Mark pulumi-resource-keycloak 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-*-keycloak" -print -exec chmod +x {} \;
+17
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-keycloak
9+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
10+
with:
11+
name: pulumi-tfgen-keycloak
12+
path: ${{ github.workspace }}/bin
13+
14+
- name: Ensure pulumi-tfgen-keycloak is executable
15+
shell: bash
16+
run: |
17+
find ${{ github.workspace }} -name "pulumi-*-keycloak" -print -exec chmod +x {} \;

.github/workflows/build_provider.yml

+1
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ jobs:
6161
tools: pulumictl, pulumicli, ${{ matrix.language }}
6262
- name: Prepare local workspace
6363
run: make prepare_local_workspace
64-
- name: Download bin
65-
uses: ./.github/actions/download-bin
64+
- name: Download tfgen
65+
uses: ./.github/actions/download-tfgen
6666
- name: Update path
6767
run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
6868
- name: Restore makefile progress

.github/workflows/master.yml

+1
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ jobs:
134134
name: test
135135
needs:
136136
- prerequisites
137+
- build_provider
137138
- build_sdk
138139
permissions:
139140
contents: read

.github/workflows/prerelease.yml

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ jobs:
7575
name: test
7676
needs:
7777
- prerequisites
78+
- build_provider
7879
- build_sdk
7980
permissions:
8081
contents: read

.github/workflows/prerequisites.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,12 @@ jobs:
9696
9797
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.
9898
99-
- name: Upload bin
100-
uses: ./.github/actions/upload-bin
99+
- name: Upload pulumi-tfgen-keycloak
100+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
101+
with:
102+
name: pulumi-tfgen-keycloak
103+
path: ${{ github.workspace }}/bin/pulumi-tfgen-keycloak
104+
retention-days: 30
101105

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

.github/workflows/release.yml

+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ jobs:
8181
name: test
8282
needs:
8383
- prerequisites
84+
- build_provider
8485
- build_sdk
8586
permissions:
8687
contents: read

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

+1
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ jobs:
123123
name: test
124124
needs:
125125
- prerequisites
126+
- build_provider
126127
- build_sdk
127128
permissions:
128129
contents: read

upstream.sh

+7-1
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)