diff --git a/.github/workflows/cloudflare-worker-preview.yml b/.github/workflows/cloudflare-worker-preview.yml index 78889616b..4f1b941bf 100644 --- a/.github/workflows/cloudflare-worker-preview.yml +++ b/.github/workflows/cloudflare-worker-preview.yml @@ -34,7 +34,7 @@ jobs: } >> "$GITHUB_OUTPUT" - name: Setup node - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0 + uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0 with: node-version-file: '.node-version' package-manager-cache: false @@ -99,7 +99,7 @@ jobs: } >> "$GITHUB_STEP_SUMMARY" - name: Publish preview URL - uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7.1.0 + uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8 env: MARKER: '' PREVIEW_URL: ${{ steps.preview.outputs.preview_url }} diff --git a/.github/workflows/cloudflare-worker-prod.yml b/.github/workflows/cloudflare-worker-prod.yml index ed0d33ff5..b26091ace 100644 --- a/.github/workflows/cloudflare-worker-prod.yml +++ b/.github/workflows/cloudflare-worker-prod.yml @@ -10,6 +10,9 @@ on: - dev workflow_dispatch: +env: + OPENTOFU_VERSION: '1.11.5' + concurrency: group: cloudflare-infra cancel-in-progress: false @@ -20,8 +23,10 @@ jobs: runs-on: ubuntu-latest permissions: contents: read + pull-requests: write env: CLOUDFLARE_API_TOKEN: ${{ secrets.TF_CLOUDFLARE_API_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TF_VAR_account_id: ${{ secrets.TF_VAR_ACCOUNT_ID }} TF_VAR_zone_id: ${{ secrets.TF_VAR_ZONE_ID }} TF_HTTP_ADDRESS: ${{ secrets.TF_HTTP_ADDRESS }} @@ -49,7 +54,7 @@ jobs: printf 'TF_VAR_workers_message=%s\n' "$workers_message" >> "$GITHUB_ENV" - name: Setup node - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0 + uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0 with: node-version-file: '.node-version' cache: 'npm' @@ -65,7 +70,7 @@ jobs: - name: Setup OpenTofu uses: opentofu/setup-opentofu@9d84900f3238fab8cd84ce47d658d25dd008be2f # v1.0.8 with: - tofu_version: 1.11.5 + tofu_version: ${{ env.OPENTOFU_VERSION }} - name: Check formatting run: tofu fmt -check @@ -76,8 +81,11 @@ jobs: - name: Validate configuration run: tofu validate -no-color - - name: Plan infrastructure - run: tofu plan -input=false -lock=false -no-color + - name: Comment PR plan + uses: dflook/tofu-plan@3f5dc358343fb58cd60f83b019e810315aa8258f # v2.2.3 + with: + path: infra/web + label: production apply: if: (github.event_name == 'push' && github.ref_name == 'dev') || github.event_name == 'workflow_dispatch' @@ -113,7 +121,7 @@ jobs: printf 'TF_VAR_workers_message=%s\n' "$workers_message" >> "$GITHUB_ENV" - name: Setup node - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0 + uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0 with: node-version-file: '.node-version' cache: 'npm' @@ -129,7 +137,7 @@ jobs: - name: Setup OpenTofu uses: opentofu/setup-opentofu@9d84900f3238fab8cd84ce47d658d25dd008be2f # v1.0.8 with: - tofu_version: 1.11.5 + tofu_version: ${{ env.OPENTOFU_VERSION }} - name: Check formatting run: tofu fmt -check diff --git a/infra/README.md b/infra/README.md index 74c8d8ee2..0617d3779 100644 --- a/infra/README.md +++ b/infra/README.md @@ -97,6 +97,8 @@ Preview deploys: Production deploys: +- PRs that change `infra/web` get an OpenTofu plan comment on the PR from + `.github/workflows/cloudflare-worker-prod.yml`. - `.github/workflows/cloudflare-worker-prod.yml` builds the app and runs `tofu apply` on pushes to `dev`, or via manual workflow dispatch. - `tofu apply` uploads `dist/` as a new immutable Worker version with