Skip to content

Commit

Permalink
Revert "Update GitHub Actions workflows." (#391)
Browse files Browse the repository at this point in the history
Reverts #386.

This is a confidence screen to gather more information for
#387. These tests are
unlikely to pass, so I will force merge this revert.
  • Loading branch information
guineveresaenger authored Jun 21, 2024
1 parent 1131a1f commit d1dcc97
Show file tree
Hide file tree
Showing 8 changed files with 95 additions and 144 deletions.
80 changes: 0 additions & 80 deletions .github/actions/setup-tools/action.yml

This file was deleted.

52 changes: 27 additions & 25 deletions .github/workflows/build_sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,6 @@ name: "Build SDK"
on:
workflow_call: {}

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
NUGET_PUBLISH_KEY: ${{ secrets.NUGET_PUBLISH_KEY }}
PUBLISH_REPO_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
PUBLISH_REPO_USERNAME: ${{ secrets.OSSRH_USERNAME }}
PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}
PULUMI_API: https://api.pulumi-staging.io
PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/..
PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget
PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
PYPI_USERNAME: __token__
SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }}
SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }}
SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
SPLUNK_PASSWORD: password
SPLUNK_URL: localhost:8089
SPLUNK_USERNAME: admin
TF_APPEND_USER_AGENT: pulumi

jobs:
build_sdk:
name: build_sdk
Expand All @@ -50,10 +28,34 @@ jobs:
path: |
.pulumi/examples-cache
key: ${{ runner.os }}-${{ hashFiles('provider/go.sum') }}
- name: Setup tools
uses: ./.github/actions/setup-tools
- name: Install pulumictl
uses: jaxxstorm/[email protected]
with:
tag: v0.0.46
repo: pulumi/pulumictl
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 20.x
registry-url: https://registry.npmjs.org
- name: Setup DotNet
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: 3.11.8
- name: Setup Java
uses: actions/setup-java@v4
with:
cache: gradle
distribution: temurin
java-version: 11
- name: Setup Gradle
uses: gradle/gradle-build-action@v3
with:
tools: pulumictl, pulumicli, go, node, dotnet, python, java
gradle-version: 7.6
- name: Download provider + tfgen binaries
uses: actions/download-artifact@v4
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
- name: Install Pulumi CLI
uses: pulumi/actions@v5
with:
pulumi-version: "dev"
pulumi-version: "^3"
- if: github.event_name == 'pull_request'
name: Install Schema Tools
uses: jaxxstorm/[email protected]
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
- name: Install Pulumi CLI
uses: pulumi/actions@v5
with:
pulumi-version: "dev"
pulumi-version: "^3"
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
with:
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
- id: version
uses: pulumi/provider-version-action@v1
- name: Publish SDKs
uses: pulumi/[email protected].18
uses: pulumi/[email protected].17
with:
sdk: all
version: ${{ steps.version.outputs.version }}
Expand Down Expand Up @@ -229,7 +229,7 @@ jobs:
- name: Install Pulumi CLI
uses: pulumi/actions@v5
with:
pulumi-version: "dev"
pulumi-version: "^3"
- name: Setup Node
uses: actions/setup-node@v4
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
- name: Install Pulumi CLI
uses: pulumi/actions@v5
with:
pulumi-version: "dev"
pulumi-version: "^3"
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
with:
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
- id: version
uses: pulumi/provider-version-action@v1
- name: Publish SDKs
uses: pulumi/[email protected].18
uses: pulumi/[email protected].17
with:
sdk: all
version: ${{ steps.version.outputs.version }}
Expand Down Expand Up @@ -194,7 +194,7 @@ jobs:
- name: Install Pulumi CLI
uses: pulumi/actions@v5
with:
pulumi-version: "dev"
pulumi-version: "^3"
- name: Setup Node
uses: actions/setup-node@v4
with:
Expand Down
45 changes: 20 additions & 25 deletions .github/workflows/prerequisites.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,6 @@ on:
type: string
required: true

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
NUGET_PUBLISH_KEY: ${{ secrets.NUGET_PUBLISH_KEY }}
PUBLISH_REPO_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
PUBLISH_REPO_USERNAME: ${{ secrets.OSSRH_USERNAME }}
PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}
PULUMI_API: https://api.pulumi-staging.io
PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/..
PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget
PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
PYPI_USERNAME: __token__
SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }}
SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }}
SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
SPLUNK_PASSWORD: password
SPLUNK_URL: localhost:8089
SPLUNK_USERNAME: admin
TF_APPEND_USER_AGENT: pulumi

jobs:
prerequisites:
name: prerequisites
Expand All @@ -53,10 +31,27 @@ jobs:
key: ${{ runner.os }}-${{ hashFiles('provider/go.sum') }}
- name: Prepare upstream code
run: make upstream
- name: Setup tools
uses: ./.github/actions/setup-tools
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: "1.21.x"
cache-dependency-path: |
provider/*.sum
upstream/*.sum
- name: Install pulumictl
uses: jaxxstorm/[email protected]
with:
tag: v0.0.46
repo: pulumi/pulumictl
- name: Install Pulumi CLI
uses: pulumi/actions@v5
with:
pulumi-version: "^3"
- if: inputs.is_pr
name: Install Schema Tools
uses: jaxxstorm/[email protected]
with:
tools: go, pulumictl, pulumicli, schema-tools
repo: pulumi/schema-tools
- name: Build schema generator binary
run: make tfgen_build_only
- name: Install plugins
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
- name: Install Pulumi CLI
uses: pulumi/actions@v5
with:
pulumi-version: "dev"
pulumi-version: "^3"
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
with:
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
- id: version
uses: pulumi/provider-version-action@v1
- name: Publish SDKs
uses: pulumi/[email protected].18
uses: pulumi/[email protected].17
with:
sdk: all
version: ${{ steps.version.outputs.version }}
Expand Down Expand Up @@ -227,7 +227,7 @@ jobs:
- name: Install Pulumi CLI
uses: pulumi/actions@v5
with:
pulumi-version: "dev"
pulumi-version: "^3"
- name: Setup Node
uses: actions/setup-node@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/resync-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- name: Install Pulumi CLI
uses: pulumi/actions@v5
with:
pulumi-version: "dev"
pulumi-version: "^3"
- name: Setup DotNet
uses: actions/setup-dotnet@v4
with:
Expand Down
40 changes: 37 additions & 3 deletions .github/workflows/run-acceptance-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,44 @@ jobs:
with:
repository: pulumi/examples
path: p-examples
- name: Setup tools
uses: ./.github/actions/setup-tools
- name: Install Go
uses: actions/setup-go@v5
with:
tools: pulumictl, pulumicli, go, node, dotnet, python, java
go-version: "1.21.x"
cache-dependency-path: |
sdk/go.sum
- name: Install pulumictl
uses: jaxxstorm/[email protected]
with:
tag: v0.0.46
repo: pulumi/pulumictl
- name: Install Pulumi CLI
uses: pulumi/actions@v5
with:
pulumi-version: "^3"
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: "20.x"
registry-url: https://registry.npmjs.org
- name: Setup DotNet
uses: actions/setup-dotnet@v4
with:
dotnet-version: "6.0.x"
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.11.8"
- name: Setup Java
uses: actions/setup-java@v4
with:
cache: gradle
distribution: temurin
java-version: "11"
- name: Setup Gradle
uses: gradle/gradle-build-action@v3
with:
gradle-version: "7.6"
- name: Download provider + tfgen binaries
uses: actions/download-artifact@v4
with:
Expand Down

0 comments on commit d1dcc97

Please sign in to comment.