Skip to content

Commit bde6bed

Browse files
committed
fix(ci): use origin/main as nx affected base for stacked PRs (#369)
- Remove push trigger (CI only runs on PRs, merge queue validates main) - Replace nx-set-shas with hardcoded origin/main base - Fixes issue where topmost PR in stack tested against wrong base causing red main - Keep changeset-release/** exclusion (workspace:* deps make CI redundant)
1 parent 661db32 commit bde6bed

File tree

2 files changed

+22
-10
lines changed

2 files changed

+22
-10
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@pgflow/client': patch
3+
---
4+
5+
Add `realtimeStabilizationDelayMs` option to PgflowClient for improved Supabase Realtime reliability

.github/workflows/ci.yml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ name: CI
22
on:
33
pull_request:
44
branches: ['**', '!changeset-release/**']
5-
push:
6-
branches: ['main']
5+
# CI only runs on PRs - merge queue validates before merge to main
76

87
concurrency:
98
group: ${{ github.workflow }}-${{ github.ref }}
@@ -43,8 +42,10 @@ jobs:
4342
with:
4443
cloud-token: ${{ secrets.ATLAS_CLOUD_TOKEN }}
4544

46-
- name: Set Nx SHAs for affected commands
47-
uses: nrwl/nx-set-shas@v4
45+
- name: Set Nx base for affected commands
46+
run: |
47+
echo "NX_BASE=origin/main" >> $GITHUB_ENV
48+
echo "NX_HEAD=HEAD" >> $GITHUB_ENV
4849
4950
- name: Verify NX_BASE and NX_HEAD are set
5051
run: echo "BASE=$NX_BASE HEAD=$NX_HEAD"
@@ -85,8 +86,10 @@ jobs:
8586
with:
8687
cloud-token: ${{ secrets.ATLAS_CLOUD_TOKEN }}
8788

88-
- name: Set Nx SHAs for affected commands
89-
uses: nrwl/nx-set-shas@v4
89+
- name: Set Nx base for affected commands
90+
run: |
91+
echo "NX_BASE=origin/main" >> $GITHUB_ENV
92+
echo "NX_HEAD=HEAD" >> $GITHUB_ENV
9093
9194
- name: Verify NX_BASE and NX_HEAD are set
9295
run: echo "BASE=$NX_BASE HEAD=$NX_HEAD"
@@ -126,8 +129,10 @@ jobs:
126129

127130
- uses: ./.github/actions/setup
128131

129-
- name: Set Nx SHAs for affected commands
130-
uses: nrwl/nx-set-shas@v4
132+
- name: Set Nx base for affected commands
133+
run: |
134+
echo "NX_BASE=origin/main" >> $GITHUB_ENV
135+
echo "NX_HEAD=HEAD" >> $GITHUB_ENV
131136
132137
- name: Verify NX_BASE and NX_HEAD are set
133138
run: echo "BASE=$NX_BASE HEAD=$NX_HEAD"
@@ -202,8 +207,10 @@ jobs:
202207

203208
- uses: ./.github/actions/setup
204209

205-
- name: Set Nx SHAs for affected commands
206-
uses: nrwl/nx-set-shas@v4
210+
- name: Set Nx base for affected commands
211+
run: |
212+
echo "NX_BASE=origin/main" >> $GITHUB_ENV
213+
echo "NX_HEAD=HEAD" >> $GITHUB_ENV
207214
208215
- name: Verify NX_BASE and NX_HEAD are set
209216
run: echo "BASE=$NX_BASE HEAD=$NX_HEAD"

0 commit comments

Comments
 (0)