Skip to content

Commit bae6756

Browse files
committed
ci: keep the release PR's CodeQL scan, require the main base for release-PR skips, gate desktop-live on workspace permissions
1 parent 3508f4f commit bae6756

4 files changed

Lines changed: 5 additions & 7 deletions

File tree

‎.github/scripts/desktop-live-changes.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ set -u
1313

1414
relevant='^(apps/desktop/|apps/realtime/'\
1515
'|packages/(desktop-bridge|browser-protocol|terminal-protocol|realtime-protocol|db|auth|emcn|utils|logger|security|platform-authz|runtime-secrets)/'\
16-
'|apps/sim/lib/(desktop|mothership|uploads|auth|terminal|browser-agent|api/(client|server))/'\
16+
'|apps/sim/lib/(desktop|mothership|uploads|auth|terminal|browser-agent|workspaces/permissions|api/(client|server))/'\
1717
'|apps/sim/lib/api/contracts/(chats|copilot|desktop-|mothership-|upload-sessions|workspace-file)'\
1818
'|apps/sim/app/api/(desktop|mothership|copilot|files|v2/uploads|auth|users/me)/'\
1919
'|apps/sim/app/api/workspaces/\[id\]/files/'\

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ jobs:
8585
# run, so 8 vCPU was 4x more machine than it ever used.
8686
runs-on: ${{ (vars.CI_PROVIDER == '' || vars.CI_PROVIDER == 'blacksmith') && matrix.bs_runner || 'ubuntu-latest' }}
8787
timeout-minutes: 60
88-
# Not on the staging -> main release pull request: every staging push re-syncs it with code the
89-
# staging pull requests already ran this on, and main's push and schedule still run it.
90-
if: github.event.pull_request.draft != true && !(github.head_ref == 'staging' && github.event.pull_request.head.repo.full_name == github.repository)
88+
if: github.event.pull_request.draft != true
9189
permissions:
9290
security-events: write
9391
contents: read

‎.github/workflows/desktop-e2e.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
name: e2e
6262
# Not on the staging -> main release pull request: every staging push re-syncs it with code the
6363
# staging pull requests already ran this on, and main's push and schedule still run it.
64-
if: github.event_name != 'schedule' && !(github.head_ref == 'staging' && github.event.pull_request.head.repo.full_name == github.repository)
64+
if: github.event_name != 'schedule' && !(github.head_ref == 'staging' && github.base_ref == 'main' && github.event.pull_request.head.repo.full_name == github.repository)
6565
runs-on: macos-26
6666
timeout-minutes: 30
6767
steps:
@@ -182,7 +182,7 @@ jobs:
182182

183183
package-smoke:
184184
name: package-smoke
185-
if: github.event_name != 'schedule' && !(github.head_ref == 'staging' && github.event.pull_request.head.repo.full_name == github.repository)
185+
if: github.event_name != 'schedule' && !(github.head_ref == 'staging' && github.base_ref == 'main' && github.event.pull_request.head.repo.full_name == github.repository)
186186
runs-on: macos-26
187187
timeout-minutes: 20
188188
steps:

‎.github/workflows/helm.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
name: chart
3939
# Not on the staging -> main release pull request: every staging push re-syncs it with code the
4040
# staging pull requests already ran this on, and main's push and schedule still run it.
41-
if: ${{ !(github.head_ref == 'staging' && github.event.pull_request.head.repo.full_name == github.repository) }}
41+
if: ${{ !(github.head_ref == 'staging' && github.base_ref == 'main' && github.event.pull_request.head.repo.full_name == github.repository) }}
4242
runs-on: &runner-2vcpu ${{ (vars.CI_PROVIDER == '' || vars.CI_PROVIDER == 'blacksmith') && 'blacksmith-2vcpu-ubuntu-2404' || 'ubuntu-latest' }}
4343
timeout-minutes: 15
4444
steps:

0 commit comments

Comments
 (0)