Skip to content

Commit

Permalink
Fix test tool setup (#1081)
Browse files Browse the repository at this point in the history 
Mirror the fix for #1079 into the nightly, main, prerelease and release
jobs.

Test is the only core part of our workflow which has not been
deduplicated and so we have to copy fixes into all the different
workflows.

Spotted from issue pulumi/pulumi-azure#2393
  • Loading branch information
@danielrbradley
danielrbradley authored Sep 13, 2024
1 parent 180aab6 commit 53d4b52
Show file tree
Hide file tree
Showing 14 changed files with 48 additions and 14 deletions.
3 changes: 2 additions & 1 deletion provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,9 @@ jobs:
tools: pulumictl, pulumicli, ${{ matrix.language }}
- name: Download bin
uses: ./.github/actions/download-bin
- run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Add NuGet source
if: matrix.language == 'dotnet'
run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Download SDK
uses: ./.github/actions/download-sdk
with:
Expand Down
5 changes: 4 additions & 1 deletion provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/nightly-test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,17 @@ jobs:
tools: pulumictl, pulumicli, ${{ matrix.language}}
- name: Download bin
uses: ./.github/actions/download-bin
- run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Add NuGet source
if: matrix.language == 'dotnet'
run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Download SDK
uses: ./.github/actions/download-sdk
with:
language: ${{ matrix.language }}
- name: Update path
run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
- name: Install Python deps
if: matrix.language == 'python'
run: |-
pip3 install virtualenv==20.0.23
pip3 install pipenv
Expand Down
5 changes: 4 additions & 1 deletion provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,17 @@ jobs:
tools: pulumictl, pulumicli, #{{ range $index, $element := .Config.languages }}##{{if $index}}#, #{{end}}##{{ $element }}##{{end}}#
- name: Download bin
uses: ./.github/actions/download-bin
- run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Add NuGet source
if: matrix.language == 'dotnet'
run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Download SDK
uses: ./.github/actions/download-sdk
with:
language: ${{ matrix.language }}
- name: Update path
run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
- name: Install Python deps
if: matrix.language == 'python'
run: |-
pip3 install virtualenv==20.0.23
pip3 install pipenv
Expand Down
5 changes: 4 additions & 1 deletion provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,17 @@ jobs:
tools: pulumictl, pulumicli, ${{ matrix.language }}
- name: Download bin
uses: ./.github/actions/download-bin
- run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Add NuGet source
if: matrix.language == 'dotnet'
run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Download SDK
uses: ./.github/actions/download-sdk
with:
language: ${{ matrix.language }}
- name: Update path
run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
- name: Install Python deps
if: matrix.language == 'python'
run: |-
pip3 install virtualenv==20.0.23
pip3 install pipenv
Expand Down
3 changes: 2 additions & 1 deletion provider-ci/test-providers/aws/.github/workflows/master.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,9 @@ jobs:
tools: pulumictl, pulumicli, ${{ matrix.language }}
- name: Download bin
uses: ./.github/actions/download-bin
- run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Add NuGet source
if: matrix.language == 'dotnet'
run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Download SDK
uses: ./.github/actions/download-sdk
with:
Expand Down
5 changes: 4 additions & 1 deletion provider-ci/test-providers/aws/.github/workflows/nightly-test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,17 @@ jobs:
tools: pulumictl, pulumicli, ${{ matrix.language}}
- name: Download bin
uses: ./.github/actions/download-bin
- run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Add NuGet source
if: matrix.language == 'dotnet'
run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Download SDK
uses: ./.github/actions/download-sdk
with:
language: ${{ matrix.language }}
- name: Update path
run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
- name: Install Python deps
if: matrix.language == 'python'
run: |-
pip3 install virtualenv==20.0.23
pip3 install pipenv
Expand Down
5 changes: 4 additions & 1 deletion provider-ci/test-providers/aws/.github/workflows/prerelease.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,17 @@ jobs:
tools: pulumictl, pulumicli, nodejs, python, dotnet, go, java
- name: Download bin
uses: ./.github/actions/download-bin
- run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Add NuGet source
if: matrix.language == 'dotnet'
run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Download SDK
uses: ./.github/actions/download-sdk
with:
language: ${{ matrix.language }}
- name: Update path
run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
- name: Install Python deps
if: matrix.language == 'python'
run: |-
pip3 install virtualenv==20.0.23
pip3 install pipenv
Expand Down
5 changes: 4 additions & 1 deletion provider-ci/test-providers/aws/.github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,17 @@ jobs:
tools: pulumictl, pulumicli, ${{ matrix.language }}
- name: Download bin
uses: ./.github/actions/download-bin
- run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Add NuGet source
if: matrix.language == 'dotnet'
run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Download SDK
uses: ./.github/actions/download-sdk
with:
language: ${{ matrix.language }}
- name: Update path
run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
- name: Install Python deps
if: matrix.language == 'python'
run: |-
pip3 install virtualenv==20.0.23
pip3 install pipenv
Expand Down
3 changes: 2 additions & 1 deletion provider-ci/test-providers/cloudflare/.github/workflows/master.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,9 @@ jobs:
tools: pulumictl, pulumicli, ${{ matrix.language }}
- name: Download bin
uses: ./.github/actions/download-bin
- run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Add NuGet source
if: matrix.language == 'dotnet'
run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Download SDK
uses: ./.github/actions/download-sdk
with:
Expand Down
5 changes: 4 additions & 1 deletion provider-ci/test-providers/cloudflare/.github/workflows/prerelease.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,17 @@ jobs:
tools: pulumictl, pulumicli, nodejs, python, dotnet, go, java
- name: Download bin
uses: ./.github/actions/download-bin
- run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Add NuGet source
if: matrix.language == 'dotnet'
run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Download SDK
uses: ./.github/actions/download-sdk
with:
language: ${{ matrix.language }}
- name: Update path
run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
- name: Install Python deps
if: matrix.language == 'python'
run: |-
pip3 install virtualenv==20.0.23
pip3 install pipenv
Expand Down
5 changes: 4 additions & 1 deletion provider-ci/test-providers/cloudflare/.github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,17 @@ jobs:
tools: pulumictl, pulumicli, ${{ matrix.language }}
- name: Download bin
uses: ./.github/actions/download-bin
- run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Add NuGet source
if: matrix.language == 'dotnet'
run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Download SDK
uses: ./.github/actions/download-sdk
with:
language: ${{ matrix.language }}
- name: Update path
run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
- name: Install Python deps
if: matrix.language == 'python'
run: |-
pip3 install virtualenv==20.0.23
pip3 install pipenv
Expand Down
3 changes: 2 additions & 1 deletion provider-ci/test-providers/docker/.github/workflows/master.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,9 @@ jobs:
tools: pulumictl, pulumicli, ${{ matrix.language }}
- name: Download bin
uses: ./.github/actions/download-bin
- run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Add NuGet source
if: matrix.language == 'dotnet'
run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Download SDK
uses: ./.github/actions/download-sdk
with:
Expand Down
5 changes: 4 additions & 1 deletion provider-ci/test-providers/docker/.github/workflows/prerelease.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,17 @@ jobs:
tools: pulumictl, pulumicli, nodejs, python, dotnet, go, java
- name: Download bin
uses: ./.github/actions/download-bin
- run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Add NuGet source
if: matrix.language == 'dotnet'
run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Download SDK
uses: ./.github/actions/download-sdk
with:
language: ${{ matrix.language }}
- name: Update path
run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
- name: Install Python deps
if: matrix.language == 'python'
run: |-
pip3 install virtualenv==20.0.23
pip3 install pipenv
Expand Down
5 changes: 4 additions & 1 deletion provider-ci/test-providers/docker/.github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,17 @@ jobs:
tools: pulumictl, pulumicli, ${{ matrix.language }}
- name: Download bin
uses: ./.github/actions/download-bin
- run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Add NuGet source
if: matrix.language == 'dotnet'
run: dotnet nuget add source ${{ github.workspace }}/nuget
- name: Download SDK
uses: ./.github/actions/download-sdk
with:
language: ${{ matrix.language }}
- name: Update path
run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
- name: Install Python deps
if: matrix.language == 'python'
run: |-
pip3 install virtualenv==20.0.23
pip3 install pipenv
Expand Down

0 comments on commit 53d4b52

Please sign in to comment.