From 1296a8d0840b159a4ae983809c53782063dee5b5 Mon Sep 17 00:00:00 2001 From: Brian Henry Date: Wed, 13 Nov 2024 14:38:31 -0700 Subject: [PATCH] re-enable normal GHA triggers --- .github/workflows/build-and-deploy.yml | 10 +++++----- .github/workflows/build-base-image.yml | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 6b28aad4c..8bb9128a7 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -3,11 +3,11 @@ name: Build Image and Deploy on: workflow_dispatch: push: - # branches: #temporary to test - # - "master" - # pull_request: - # branches: - # - "master" + branches: + - "master" + pull_request: + branches: + - "master" concurrency: group: docker-${{ github.ref }} diff --git a/.github/workflows/build-base-image.yml b/.github/workflows/build-base-image.yml index 0283f70d7..fc30b890b 100644 --- a/.github/workflows/build-base-image.yml +++ b/.github/workflows/build-base-image.yml @@ -3,10 +3,10 @@ name: Build Base Image on: workflow_dispatch: push: - # branches: #temporary to test - # - "main" - # paths: - # - ".docker/base/**" + branches: + - "main" + paths: + - ".docker/base/**" concurrency: group: base-${{ github.ref }}