From 210fa646b173cc616148e567df905f66cd6e6452 Mon Sep 17 00:00:00 2001 From: dal Date: Sun, 24 Aug 2025 22:35:49 -0600 Subject: [PATCH] ci cd fixes --- .github/workflows/deploy.yml | 4 ++-- .github/workflows/docker-build-server.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index aa7d4cd82..8be17566e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -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 diff --git a/.github/workflows/docker-build-server.yml b/.github/workflows/docker-build-server.yml index 4cbdf8b38..8ad5fd29d 100644 --- a/.github/workflows/docker-build-server.yml +++ b/.github/workflows/docker-build-server.yml @@ -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: