From 029dfc7543179876f724e9d02c8fb4cc66d033fd Mon Sep 17 00:00:00 2001 From: Mogyuchi Date: Wed, 23 Oct 2024 17:07:18 +0900 Subject: [PATCH] ci: switch to wrangler-action (#1019) * ci: switch to wrangler-action * fixup! ci: switch to wrangler-action * fixup! fixup! ci: switch to wrangler-action --- .github/workflows/deploy.yml | 43 +++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index fc162f7cf..a7bd0cf9e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,14 +1,19 @@ name: Cloudflare Pages env: - CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} - CLOUDFLARE_ACCOUNT_ID: ${{ vars.CLOUDFLARE_ACCOUNT_ID }} - CLOUDFLARE_PROJECT_NAME: ${{ vars.CLOUDFLARE_PROJECT_NAME }} + #CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} + #CLOUDFLARE_ACCOUNT_ID: ${{ vars.CLOUDFLARE_ACCOUNT_ID }} + #CLOUDFLARE_PROJECT_NAME: ${{ vars.CLOUDFLARE_PROJECT_NAME }} CLOUDFLARE_DIRECTORY: _site + # tool versions + # renovate: datasource=npm depName=wrangler + WRANGLER_VERSION: 3.82.0 + on: push: branches: ["**"] + # マージ コミットのコンテキストではなく、pull request のベースのコンテキストで実行されます。 pull_request_target: permissions: {} @@ -40,7 +45,7 @@ jobs: runs-on: ubuntu-latest environment: name: ${{ needs.pre-deployment.outputs.environment }} - url: ${{ steps.publish.outputs.url }} + url: ${{ steps.deploy.outputs.deployment-url }} permissions: contents: read @@ -61,16 +66,19 @@ jobs: - run: mkdir _site && cp test _site/index.html - - id: publish - # This workflow does NOT work with v1.5.0 - uses: cloudflare/pages-action@61eafe73baad0195ab582cb447b2c6e15a0df9ce # v1.4.1 + - name: Install pnpm + uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0 + - id: deploy + name: Deploy + uses: cloudflare/wrangler-action@v3.9.0 with: - apiToken: ${{ env.CLOUDFLARE_API_TOKEN }} - accountId: ${{ env.CLOUDFLARE_ACCOUNT_ID }} - projectName: ${{ env.CLOUDFLARE_PROJECT_NAME }} - directory: ${{ env.CLOUDFLARE_DIRECTORY }} - gitHubToken: ${{ secrets.GITHUB_TOKEN }} - branch: ${{ env.BRANCH }} + wranglerVersion: ${{ env.WRANGLER_VERSION }} + apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} + accountId: ${{ vars.CLOUDFLARE_ACCOUNT_ID }} + command: pages deploy ${{ env.CLOUDFLARE_DIRECTORY }} --project-name=${{ vars.CLOUDFLARE_PROJECT_NAME }} + - run: echo "$output" >> $GITHUB_STEP_SUMMARY + env: + output: ${{ steps.deploy.outputs.command-output }} - if: ${{ ! cancelled() && github.event_name == 'pull_request_target' }} uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3.1.0 @@ -88,7 +96,6 @@ jobs: echo "$(echo "$1" | head -c 7)" } echo "commit_text=$(get_short_sha_with_link $(git rev-parse HEAD)) ( base: $(get_short_sha_with_link ${{ github.event.pull_request.base.sha }}) + head: $(get_short_sha_with_link ${{ github.event.pull_request.head.sha }}) )" >> "$GITHUB_OUTPUT" - echo "pr_preview_url=$(echo '${{ steps.publish.outputs.url }}' | perl -pe "s|(//).+?(\.)|\$1$(echo '${{ env.BRANCH }}' | perl -pe 's|/|-|g')\$2|")" >> "$GITHUB_OUTPUT" - if: steps.fc.conclusion == 'success' uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0 with: @@ -102,15 +109,15 @@ jobs: Status: ✅  Deploy successful! Preview URL: - ${{ steps.publish.outputs.url }} + ${{ steps.deploy.outputs.deployment-url }} PR Preview URL: - ${{ steps.comment-data.outputs.pr_preview_url }} + ${{ steps.deploy.outputs.deployment-alias-url }} [View workflow logs](${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}) - [View Cloudflare logs](https://dash.cloudflare.com/?to=/${{ env.CLOUDFLARE_ACCOUNT_ID }}/pages/view/${{ env.CLOUDFLARE_PROJECT_NAME }}/${{ steps.publish.outputs.id }}) + [View Cloudflare logs](https://dash.cloudflare.com/?to=/${{ vars.CLOUDFLARE_ACCOUNT_ID }}/pages/view/${{ vars.CLOUDFLARE_PROJECT_NAME }}/) edit-mode: replace - uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0 @@ -128,5 +135,5 @@ jobs: [View workflow logs](${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}) - [View Cloudflare logs](https://dash.cloudflare.com/?to=/${{ env.CLOUDFLARE_ACCOUNT_ID }}/pages/view/${{ env.CLOUDFLARE_PROJECT_NAME }}/${{ steps.publish.outputs.id }}) + [View Cloudflare logs](https://dash.cloudflare.com/?to=/${{ vars.CLOUDFLARE_ACCOUNT_ID }}/pages/view/${{ vars.CLOUDFLARE_PROJECT_NAME }}/) edit-mode: replace