Skip to content

fix(ci): use origin/main as nx affected base for stacked PRs #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+22 −10
Closed

fix(ci): use origin/main as nx affected base for stacked PRs #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/client-realtime-stabilization-delay.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@pgflow/client': patch
---

Add `realtimeStabilizationDelayMs` option to PgflowClient for improved Supabase Realtime reliability
27 changes: 17 additions & 10 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ name: CI
on:
pull_request:
branches: ['**', '!changeset-release/**']
push:
branches: ['main']
# CI only runs on PRs - merge queue validates before merge to main

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down Expand Up @@ -43,8 +42,10 @@ jobs:
with:
cloud-token: ${{ secrets.ATLAS_CLOUD_TOKEN }}

- name: Set Nx SHAs for affected commands
uses: nrwl/nx-set-shas@v4
- name: Set Nx base for affected commands
run: |
echo "NX_BASE=origin/main" >> $GITHUB_ENV
echo "NX_HEAD=HEAD" >> $GITHUB_ENV
Comment on lines +45 to +48
Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot Nov 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Set NX_BASE to ref that is never fetched

The workflow now hardcodes NX_BASE=origin/main (lines 45‑48), but the preceding checkout only fetches the PR ref. With actions/checkout@v4 the default ref for pull_request is refs/pull/*/merge, so no origin/main remote is created unless fetched explicitly. On PR runs pnpm nx affected ... --base=origin/main will fail with fatal: ambiguous argument 'origin/main' because that ref does not exist in the local clone, breaking all CI jobs. Please fetch the main branch or derive base/HEAD with an action before setting these env vars.

Useful? React with 👍 / 👎.


- name: Verify NX_BASE and NX_HEAD are set
run: echo "BASE=$NX_BASE HEAD=$NX_HEAD"
Expand Down Expand Up @@ -85,8 +86,10 @@ jobs:
with:
cloud-token: ${{ secrets.ATLAS_CLOUD_TOKEN }}

- name: Set Nx SHAs for affected commands
uses: nrwl/nx-set-shas@v4
- name: Set Nx base for affected commands
run: |
echo "NX_BASE=origin/main" >> $GITHUB_ENV
echo "NX_HEAD=HEAD" >> $GITHUB_ENV

- name: Verify NX_BASE and NX_HEAD are set
run: echo "BASE=$NX_BASE HEAD=$NX_HEAD"
Expand Down Expand Up @@ -126,8 +129,10 @@ jobs:

- uses: ./.github/actions/setup

- name: Set Nx SHAs for affected commands
uses: nrwl/nx-set-shas@v4
- name: Set Nx base for affected commands
run: |
echo "NX_BASE=origin/main" >> $GITHUB_ENV
echo "NX_HEAD=HEAD" >> $GITHUB_ENV

- name: Verify NX_BASE and NX_HEAD are set
run: echo "BASE=$NX_BASE HEAD=$NX_HEAD"
Expand Down Expand Up @@ -202,8 +207,10 @@ jobs:

- uses: ./.github/actions/setup

- name: Set Nx SHAs for affected commands
uses: nrwl/nx-set-shas@v4
- name: Set Nx base for affected commands
run: |
echo "NX_BASE=origin/main" >> $GITHUB_ENV
echo "NX_HEAD=HEAD" >> $GITHUB_ENV

- name: Verify NX_BASE and NX_HEAD are set
run: echo "BASE=$NX_BASE HEAD=$NX_HEAD"
Expand Down