From b91561bac81707a93e8a69511c777afeb35fb933 Mon Sep 17 00:00:00 2001 From: Pulumi Bot Date: Tue, 3 Dec 2024 06:14:16 +0000 Subject: [PATCH] [internal] Update GitHub Actions workflow files --- .github/workflows/build_provider.yml | 2 +- .github/workflows/master.yml | 1 + .github/workflows/publish.yml | 11 ++++ .github/workflows/resync-build.yml | 92 ---------------------------- 4 files changed, 13 insertions(+), 93 deletions(-) delete mode 100644 .github/workflows/resync-build.yml diff --git a/.github/workflows/build_provider.yml b/.github/workflows/build_provider.yml index 032a947..1f53419 100644 --- a/.github/workflows/build_provider.yml +++ b/.github/workflows/build_provider.yml @@ -46,7 +46,7 @@ jobs: pattern: schema-embed.* # Avoid creating directories for each artifact merge-multiple: true - path: provider/cmd/pulumi-resource-splunk/schema-embed.json + path: provider/cmd/pulumi-resource-splunk - name: Restore makefile progress run: make --touch provider schema - name: Build & package provider diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 5d7afc1..fff4764 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -108,6 +108,7 @@ jobs: version: ${{ needs.prerequisites.outputs.version }} isPrerelease: true skipGoSdk: true + skipJavaSdk: true tag_release_if_labeled_needs_release: name: Tag release if labeled as needs-release diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c6aaad3..7a853ad 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -14,6 +14,10 @@ on: default: false type: boolean description: Skip publishing & verifying the Go SDK + skipJavaSdk: + default: false + type: boolean + description: Skip publishing the Java SDK env: IS_PRERELEASE: ${{ inputs.isPrerelease }} @@ -122,10 +126,17 @@ jobs: with: tools: pulumictl, pulumicli, nodejs, python, dotnet, go, java - name: Publish SDKs + if: inputs.skipJavaSdk == false uses: pulumi/pulumi-package-publisher@1c0359ba74243cf6651efacfd839c751d8ff87e2 # v0.0.20 with: sdk: all version: ${{ inputs.version }} + - name: Publish SDKs (except Java) + if: inputs.skipJavaSdk == true + uses: pulumi/pulumi-package-publisher@1c0359ba74243cf6651efacfd839c751d8ff87e2 # v0.0.20 + with: + sdk: all,!java + version: ${{ inputs.version }} - name: Download Go SDK uses: ./.github/actions/download-sdk with: diff --git a/.github/workflows/resync-build.yml b/.github/workflows/resync-build.yml deleted file mode 100644 index 6483db7..0000000 --- a/.github/workflows/resync-build.yml +++ /dev/null @@ -1,92 +0,0 @@ -# WARNING: This file is autogenerated - changes will be overwritten when regenerated by https://github.com/pulumi/ci-mgmt - -env: - PULUMI_EXTRA_MAPPING_ERROR: true - PULUMI_MISSING_MAPPING_ERROR: true - 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 }} - SPLUNK_PASSWORD: password - SPLUNK_URL: localhost:8089 - SPLUNK_USERNAME: admin - TF_APPEND_USER_AGENT: pulumi -jobs: - resync_build: - name: resync-build - runs-on: ubuntu-latest - steps: - - name: Checkout Repo - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - # Persist credentials so we can push a new branch. - persist-credentials: true - - name: Checkout repo - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - path: ci-mgmt - repository: pulumi/ci-mgmt - persist-credentials: false - - id: run-url - name: Create URL to the run output - run: echo "run-url=https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" >> "$GITHUB_OUTPUT" - - name: Setup tools - uses: ./.github/actions/setup-tools - with: - tools: pulumictl, pulumicli, go, nodejs, dotnet, python - - name: Sync with ci-mgmt - run: cp -r "ci-mgmt/provider-ci/providers/$PROVIDER/repo/." . - - name: Remove ci-mgmt directory - run: rm -rf ci-mgmt - - name: Required entries for gitignore - run: |- - cat <<- EOF > "$RUNNER_TEMP/gitignore" - sdk/java/build - sdk/java/.gradle - sdk/java/gradle - sdk/java/gradlew - sdk/java/gradlew.bat - EOF - shell: bash - - name: Adding missing lines to .gitignore - run: | - comm -23 <(sort "$RUNNER_TEMP/gitignore") <(sort .gitignore) >> .gitignore.temp - cat .gitignore.temp >> .gitignore - rm .gitignore.temp - shell: bash - - name: Build - run: make build - - name: Create PR (no linked issue) - uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5 - with: - author: pulumi-bot - base: master - body: This pull request was generated automatically by the resync-build workflow - in this repository. - branch: pulumi-bot/resync-${{ github.run_id}} - commit-message: Resync build for pulumi-splunk - committer: pulumi-bot - labels: impact/no-changelog-required - team-reviewers: platform-integrations - title: Fix up build for pulumi-splunk - token: ${{ secrets.PULUMI_BOT_TOKEN }} -name: Resync build -on: - workflow_dispatch: - inputs: - automerge: - default: false - description: Mark created PR for auto-merging? - required: true - type: boolean