ci cd fixes

This commit is contained in:
dal 2025-08-24 22:35:49 -06:00
parent a03776ed0a
commit 210fa646b1
No known key found for this signature in database
GPG Key ID: 16F4B0E1E9F61122
2 changed files with 3 additions and 2 deletions

View File

@ -8,7 +8,7 @@ on:
jobs:
deploy:
if: ${{ (github.event_name == 'workflow_dispatch') || (github.event.workflow_run.conclusion == 'success' && (github.event.workflow_run.head_branch == 'main' || github.event.workflow_run.head_branch == 'staging')) }}
if: ${{ github.event.workflow_run.conclusion == 'success' && (github.event.workflow_run.head_branch == 'main' || github.event.workflow_run.head_branch == 'staging') }}
runs-on: blacksmith-2vcpu-ubuntu-2404
environment: ${{ github.event.workflow_run.head_branch }}
@ -16,7 +16,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
with:
ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.environment || github.event.workflow_run.head_branch }}
ref: ${{ github.event.workflow_run.head_branch }}
- name: Get commit SHA
id: commit

View File

@ -8,6 +8,7 @@ on:
- 'packages/**'
- 'pnpm-lock.yaml'
- '.github/workflows/docker-build-server.yml'
- '.github/workflows/deploy.yml'
# Only one build per branch at a time, queue others
concurrency: