Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: arcjet/arcjet-js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: aa1f2236b310d37e752f01a98cfc2ce167ace9c3
Choose a base ref
..
head repository: arcjet/arcjet-js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: eb2ba6e942ff15a611906f35bd19e998e39e95bc
Choose a head ref
9 changes: 6 additions & 3 deletions .github/workflows/merge-queue.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
name: Merge queue
name: Merge Queue

on:
# We use Trunk Merge Queues so we use this `push` event instead of the
# `merge_queue` event, as per
# https://docs.trunk.io/merge/set-up-trunk-merge#configure-merge-requirements
push:
branches:
- trunk-merge/**

jobs:
test:
name: Merge queue - Run tests
name: Run tests
uses: ./.github/workflows/reusable-test.yml

examples:
name: Merge queue - Build examples
name: Build examples
uses: ./.github/workflows/reusable-examples.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
name: Build examples
name: Pull Request

on:
# We cannot filter by path as this is a required check. See
# https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks#handling-skipped-but-required-checks
push:
branches:
- main
pull_request:
# Recommended by Graphite: https://graphite.dev/docs/github-configuration-guidelines#github-actions
types: [opened, synchronize, reopened]
@@ -15,5 +10,10 @@ concurrency:
cancel-in-progress: true

jobs:
test:
name: Run tests
uses: ./.github/workflows/reusable-test.yml

examples:
name: Build examples
uses: ./.github/workflows/reusable-examples.yml
22 changes: 17 additions & 5 deletions .github/workflows/release.yml → .github/workflows/push.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,32 @@
name: "Create release"
name: Push

on:
push:
# Only ever run `push` events against protected branches, likely just `main`
branches:
- main

# Release Please creates a Pull Request with changes to files
permissions:
contents: write
pull-requests: write
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
name: Run tests
uses: ./.github/workflows/reusable-test.yml

examples:
name: Build examples
uses: ./.github/workflows/reusable-examples.yml

release:
runs-on: ubuntu-latest
# Release Please is very fast, so we set a tiny timeout
timeout-minutes: 1
# Release Please creates a Pull Request with changes to files
permissions:
contents: write
pull-requests: write
steps:
- name: Release Please
uses: google-github-actions/release-please-action@a2d8d683f209466ee8c695cd994ae2cf08b1642d
10 changes: 5 additions & 5 deletions .github/workflows/reusable-examples.yml
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ on: [workflow_call]

jobs:
nextjs-13-pages-wrap:
name: "Next.js 13 + Page Router + withArcjet"
name: Next.js 13 + Page Router + withArcjet
runs-on: ubuntu-latest
steps:
# Environment security
@@ -40,7 +40,7 @@ jobs:
run: npm run build

nextjs-14-app-dir-rl:
name: "Next.js 14 + App Router + Rate Limit"
name: Next.js 14 + App Router + Rate Limit
runs-on: ubuntu-latest
steps:
# Environment security
@@ -74,7 +74,7 @@ jobs:
run: npm run build

nextjs-14-app-dir-validate-email:
name: "Next.js 14 + App Router + Validate Email"
name: Next.js 14 + App Router + Validate Email
runs-on: ubuntu-latest
steps:
# Environment security
@@ -108,7 +108,7 @@ jobs:
run: npm run build

nextjs-14-openai:
name: "Next.js 14 + OpenAI"
name: Next.js 14 + OpenAI
runs-on: ubuntu-latest
steps:
# Environment security
@@ -142,7 +142,7 @@ jobs:
run: npm run build

nextjs-14-pages-wrap:
name: "Next.js 14 + Page Router + withArcjet"
name: Next.js 14 + Page Router + withArcjet
runs-on: ubuntu-latest
steps:
# Environment security
19 changes: 0 additions & 19 deletions .github/workflows/test.yml

This file was deleted.

4 changes: 4 additions & 0 deletions .trunk/trunk.yaml
Original file line number Diff line number Diff line change
@@ -53,3 +53,7 @@ actions:
- trunk-check-pre-push
- trunk-announce
- trunk-upgrade-available
merge:
required_statuses:
- Run tests
- Build examples