Merge pull request #566 from cloudflare/spersad/relax-checks

Relax PR checks

Author: Shaun Persad

.github/dependabot.yml

@@ -8,7 +8,7 @@ updates:
   - package-ecosystem: "npm" # See documentation for possible values
     directories:
       - "**/*"
-    target-branch: "staging"
+    target-branch: "main"
     schedule:
       # just in time for on-call handoff
       interval: "weekly"

.github/workflows/main.yaml

@@ -13,6 +13,7 @@ jobs:
     env:
       CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
       CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       TEMPLATES_API_CLIENT_ID: ${{ secrets.TEMPLATES_API_CLIENT_ID }}
       TEMPLATES_API_CLIENT_SECRET: ${{ secrets.TEMPLATES_API_CLIENT_SECRET }}
     steps:

.github/workflows/pull-request-deps.yaml

@@ -0,0 +1,45 @@
+name: "Pull Request Deps"
+
+on:
+  pull_request: # this action runs in an untrusted but secure context with no secrets
+    types:
+      - opened
+      - reopened
+
+jobs:
+  autofix-deps:
+    if: github.actor == 'dependabot[bot]'
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}-autofix-deps
+      cancel-in-progress: true
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/setup
+
+      - name: Autofix
+        run: pnpm -w fix:deps
+
+      - name: Install updated packages
+        run: pnpm install
+
+      - name: Re-run other fixes with updated packages
+        run: pnpm -w fix
+
+      - name: Run checks
+        run: pnpm -w check
+
+      - name: Run tests
+        run: pnpm -w test
+
+      - name: Commit and push changes
+        run: |
+          if [[ -n "$(git diff --exit-code)" ]]; then
+            # configure user
+            git config --global user.name "${{ github.actor }}"
+            git config --global user.email "${{ github.actor }}@users.noreply.github.com"
+
+            git commit -m 'autofix dependabot PR'
+            git push
+          fi

cli/src/index.ts

@@ -8,6 +8,7 @@ import { preview } from "./preview";
 import { validateLiveDemoLinks } from "./validateLiveDemoLinks";
 import { actionWithSummary } from "./util";
 import { validateD2CButtons } from "./validateD2CButtons";
+import { setupHooks } from "./setupHooks";
 
 const program = new Command();
 
@@ -162,4 +163,11 @@ program
     );
   });
 
+program
+  .command("setup-hooks")
+  .description("sets up git hooks")
+  .action(() => {
+    setupHooks();
+  });
+
 program.parseAsync();

cli/src/setupHooks.ts

@@ -0,0 +1,12 @@
+import fs from "node:fs";
+
+const prePushHook = `
+#!/bin/bash
+pnpm run fix`.trim();
+
+export function setupHooks() {
+  fs.writeFileSync(".git/hooks/pre-push", prePushHook, {
+    encoding: "utf-8",
+    mode: 0o755,
+  });
+}

package.json

@@ -19,20 +19,20 @@
     ]
   },
   "scripts": {
-    "check": "pnpm run /^check:.*/ && git diff --exit-code",
+    "check": "pnpm run check:templates && pnpm run check:lockfiles && pnpm run check:turbo && pnpm run check:prettier && git diff --exit-code",
     "check:lockfiles": "templates lint-npm-lockfiles",
     "check:prettier": "prettier . --check",
-    "check:syncpack": "syncpack lint",
     "check:templates": "templates lint .",
     "check:turbo": "turbo run check cf-typegen",
     "deploy": "turbo run deploy",
-    "fix": "pnpm run /^fix:.*/",
+    "check:deps": "syncpack lint",
+    "fix:deps": "syncpack format && syncpack fix-mismatches",
+    "fix": "pnpm run fix:templates && pnpm run fix:lockfiles && pnpm run fix:turbo && pnpm run fix:prettier",
     "fix:lockfiles": "templates generate-npm-lockfiles",
     "fix:prettier": "prettier . --write",
-    "fix:syncpack": "syncpack format && syncpack fix-mismatches",
     "fix:templates": "templates lint . --fix",
     "fix:turbo": "turbo run cf-typegen",
-    "postinstall": "turbo run build",
+    "postinstall": "turbo run build && templates setup-hooks",
     "preview": "templates preview",
     "test": "turbo run test -- --passWithNoTests",
     "test:cli": "vitest",