[internal] Update GitHub Actions workflow files (#217)

pulumi · Jun 6, 2024 · 57fbb26 · 57fbb26
1 parent 8cae235
commit 57fbb26
Show file tree

Hide file tree

Showing 11 changed files with 132 additions and 218 deletions.
diff --git a/.github/workflows/check-upstream-upgrade.yml b/.github/workflows/check-upstream-upgrade.yml
@@ -11,9 +11,9 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v5
       with:
+        go-version: "1.21.x"
         cache-dependency-path: |
-            sdk/go.sum
-        go-version: 1.21.x
+          sdk/go.sum
     - name: Checkout Repo
       uses: actions/checkout@v4
     - name: Install upgrade-provider

diff --git a/.github/workflows/command-dispatch.yml b/.github/workflows/command-dispatch.yml
@@ -1,17 +1,9 @@
 # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt
 
 env:
-  PROVIDER: local
-  DOTNETVERSION: |
-      6.0.x
-      3.1.301
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GOVERSION: 1.21.x
-  GRADLEVERSION: "7.6"
-  JAVAVERSION: "11"
   LOCAL_TOKEN: ${{ secrets.LOCAL_TOKEN }}
   NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-  NODEVERSION: 20.x
   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
   NUGET_PUBLISH_KEY: ${{ secrets.NUGET_PUBLISH_KEY }}
   PUBLISH_REPO_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
@@ -22,13 +14,11 @@ env:
   PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget
   PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
   PYPI_USERNAME: __token__
-  PYTHONVERSION: 3.11.8
   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 }}
   TF_APPEND_USER_AGENT: pulumi
-  TRAVIS_OS_NAME: linux
 jobs:
   command-dispatch-for-testing:
     name: command-dispatch-for-testing

diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml
@@ -8,16 +8,9 @@ on:
 
 
 env:
-  DOTNETVERSION: |
-      6.0.x
-      3.1.301
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GOVERSION: 1.21.x
-  GRADLEVERSION: "7.6"
-  JAVAVERSION: "11"
   LOCAL_TOKEN: ${{ secrets.LOCAL_TOKEN }}
   NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-  NODEVERSION: 20.x
   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
   NUGET_PUBLISH_KEY: ${{ secrets.NUGET_PUBLISH_KEY }}
   PUBLISH_REPO_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
@@ -28,13 +21,11 @@ env:
   PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget
   PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
   PYPI_USERNAME: __token__
-  PYTHONVERSION: 3.11.8
   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 }}
   TF_APPEND_USER_AGENT: pulumi
-  TRAVIS_OS_NAME: linux
 
 jobs:
   license_check:
@@ -50,7 +41,7 @@ jobs:
       with:
         cache-dependency-path: |
             sdk/go.sum
-        go-version: 1.21.x
+        go-version: "1.21.x"
     - run: make upstream
     - uses: pulumi/license-check-action@main
       with:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -7,16 +7,9 @@ on:
     inputs: {}
 
 env:
-  DOTNETVERSION: |
-      6.0.x
-      3.1.301
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GOVERSION: 1.21.x
-  GRADLEVERSION: "7.6"
-  JAVAVERSION: "11"
   LOCAL_TOKEN: ${{ secrets.LOCAL_TOKEN }}
   NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-  NODEVERSION: 20.x
   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
   NUGET_PUBLISH_KEY: ${{ secrets.NUGET_PUBLISH_KEY }}
   PUBLISH_REPO_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
@@ -27,13 +20,11 @@ env:
   PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget
   PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
   PYPI_USERNAME: __token__
-  PYTHONVERSION: 3.11.8
   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 }}
   TF_APPEND_USER_AGENT: pulumi
-  TRAVIS_OS_NAME: linux
 
 jobs:
   lint:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,17 +1,9 @@
 # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt
 
 env:
-  PROVIDER: local
-  DOTNETVERSION: |
-      6.0.x
-      3.1.301
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GOVERSION: 1.21.x
-  GRADLEVERSION: "7.6"
-  JAVAVERSION: "11"
   LOCAL_TOKEN: ${{ secrets.LOCAL_TOKEN }}
   NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-  NODEVERSION: 20.x
   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
   NUGET_PUBLISH_KEY: ${{ secrets.NUGET_PUBLISH_KEY }}
   PUBLISH_REPO_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
@@ -22,13 +14,11 @@ env:
   PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget
   PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
   PYPI_USERNAME: __token__
-  PYTHONVERSION: 3.11.8
   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 }}
   TF_APPEND_USER_AGENT: pulumi
-  TRAVIS_OS_NAME: linux
 jobs:
   build_sdk:
     name: build_sdk
@@ -43,9 +33,9 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v5
       with:
+        go-version: "1.21.x"
         cache-dependency-path: |
-            sdk/go.sum
-        go-version: 1.21.x
+          sdk/go.sum
     - name: Cache examples generation
       uses: actions/cache@v4
       with:
@@ -60,41 +50,41 @@ jobs:
     - name: Install Pulumi CLI
       uses: pulumi/actions@v5
       with:
-        pulumi-version: ^3
+        pulumi-version: "^3"
     - name: Setup Node
       uses: actions/setup-node@v4
       with:
-        node-version: ${{ env.NODEVERSION }}
+        node-version: "20.x"
         registry-url: https://registry.npmjs.org
     - name: Setup DotNet
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: ${{ env.DOTNETVERSION }}
+        dotnet-version: "6.0.x"
     - name: Setup Python
       uses: actions/setup-python@v5
       with:
-        python-version: ${{ env.PYTHONVERSION }}
+        python-version: "3.11.8"
     - name: Setup Java
       uses: actions/setup-java@v4
       with:
         cache: gradle
         distribution: temurin
-        java-version: ${{ env.JAVAVERSION }}
+        java-version: "11"
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v3
       with:
-        gradle-version: ${{ env.GRADLEVERSION }}
+        gradle-version: "7.6"
     - name: Download provider + tfgen binaries
       uses: actions/download-artifact@v4
       with:
-        name: ${{ env.PROVIDER }}-provider.tar.gz
+        name: local-provider.tar.gz
         path: ${{ github.workspace }}/bin
     - name: Untar provider binaries
       run: >-
         tar -zxf ${{ github.workspace }}/bin/provider.tar.gz -C ${{
         github.workspace}}/bin
 
-        find ${{ github.workspace }} -name "pulumi-*-${{ env.PROVIDER }}" -print -exec chmod +x {} \;
+        find ${{ github.workspace }} -name "pulumi-*-local" -print -exec chmod +x {} \;
     - name: Install plugins
       run: make install_plugins
     - name: Update path
@@ -159,9 +149,9 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v5
       with:
+        go-version: "1.21.x"
         cache-dependency-path: |
-            sdk/go.sum
-        go-version: 1.21.x
+          sdk/go.sum
     - name: Install pulumictl
       uses: jaxxstorm/[email protected]
       with:
@@ -170,7 +160,7 @@ jobs:
     - name: Install Pulumi CLI
       uses: pulumi/actions@v5
       with:
-        pulumi-version: ^3
+        pulumi-version: "^3"
     - if: github.event_name == 'pull_request'
       name: Install Schema Tools
       uses: jaxxstorm/[email protected]
@@ -217,7 +207,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.21.x
+        go-version: "1.21.x"
         cache-dependency-path: |
           provider/*.sum
           upstream/*.sum
@@ -229,7 +219,7 @@ jobs:
     - name: Install Pulumi CLI
       uses: pulumi/actions@v5
       with:
-        pulumi-version: ^3
+        pulumi-version: "^3"
     - if: github.event_name == 'pull_request'
       name: Install Schema Tools
       uses: jaxxstorm/[email protected]
@@ -251,7 +241,7 @@ jobs:
         EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
         {
           echo "SCHEMA_CHANGES<<$EOF";
-          schema-tools compare -p ${{ env.PROVIDER }} -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-${{ env.PROVIDER }}/schema.json;
+          schema-tools compare -p local -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-local/schema.json;
           echo "$EOF";
         } >> "$GITHUB_ENV"
     - if: github.event_name == 'pull_request' && github.actor != 'dependabot[bot]'
@@ -268,12 +258,12 @@ jobs:
 
     - name: Tar provider binaries
       run: tar -zcf ${{ github.workspace }}/bin/provider.tar.gz -C ${{
-        github.workspace }}/bin/ pulumi-resource-${{ env.PROVIDER }}
-        pulumi-tfgen-${{ env.PROVIDER }}
+        github.workspace }}/bin/ pulumi-resource-local
+        pulumi-tfgen-local
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ env.PROVIDER }}-provider.tar.gz
+        name: local-provider.tar.gz
         path: ${{ github.workspace }}/bin/provider.tar.gz
         retention-days: 30
     - if: failure() && github.event_name == 'push'
@@ -304,9 +294,9 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v5
       with:
+        go-version: "1.21.x"
         cache-dependency-path: |
-            sdk/go.sum
-        go-version: 1.21.x
+          sdk/go.sum
     - name: Install pulumictl
       uses: jaxxstorm/[email protected]
       with:
@@ -315,7 +305,7 @@ jobs:
     - name: Install Pulumi CLI
       uses: pulumi/actions@v5
       with:
-        pulumi-version: ^3
+        pulumi-version: "^3"
     - name: Configure AWS Credentials
       uses: aws-actions/configure-aws-credentials@v4
       with:
@@ -324,7 +314,7 @@ jobs:
         aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         role-duration-seconds: 7200
         role-external-id: upload-pulumi-release
-        role-session-name: ${{ env.PROVIDER }}@githubActions
+        role-session-name: local@githubActions
         role-to-assume: ${{ secrets.AWS_UPLOAD_ROLE_ARN }}
     - id: version
       uses: pulumi/provider-version-action@v1
@@ -401,9 +391,9 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v5
       with:
+        go-version: "1.21.x"
         cache-dependency-path: |
-            sdk/go.sum
-        go-version: 1.21.x
+          sdk/go.sum
     - name: Install pulumictl
       uses: jaxxstorm/[email protected]
       with:
@@ -412,41 +402,41 @@ jobs:
     - name: Install Pulumi CLI
       uses: pulumi/actions@v5
       with:
-        pulumi-version: ^3
+        pulumi-version: "^3"
     - name: Setup Node
       uses: actions/setup-node@v4
       with:
-        node-version: ${{ env.NODEVERSION }}
+        node-version: "20.x"
         registry-url: https://registry.npmjs.org
     - name: Setup DotNet
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: ${{ env.DOTNETVERSION }}
+        dotnet-version: "6.0.x"
     - name: Setup Python
       uses: actions/setup-python@v5
       with:
-        python-version: ${{ env.PYTHONVERSION }}
+        python-version: "3.11.8"
     - name: Setup Java
       uses: actions/setup-java@v4
       with:
         cache: gradle
         distribution: temurin
-        java-version: ${{ env.JAVAVERSION }}
+        java-version: "11"
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v3
       with:
-        gradle-version: ${{ env.GRADLEVERSION }}
+        gradle-version: "7.6"
     - name: Download provider + tfgen binaries
       uses: actions/download-artifact@v4
       with:
-        name: ${{ env.PROVIDER }}-provider.tar.gz
+        name: local-provider.tar.gz
         path: ${{ github.workspace }}/bin
     - name: Untar provider binaries
       run: >-
         tar -zxf ${{ github.workspace }}/bin/provider.tar.gz -C ${{
         github.workspace}}/bin
 
-        find ${{ github.workspace }} -name "pulumi-*-${{ env.PROVIDER }}" -print -exec chmod +x {} \;
+        find ${{ github.workspace }} -name "pulumi-*-local" -print -exec chmod +x {} \;
     - run: dotnet nuget add source ${{ github.workspace }}/nuget
     - name: Download SDK
       uses: actions/download-artifact@v4