From a3548b38d50173b3debf24af74424451c725474a Mon Sep 17 00:00:00 2001 From: nemanjam Date: Sun, 18 Aug 2024 12:18:29 +0200 Subject: [PATCH] switch to bash nginx github action, enable docker deploy trigger --- .github/workflows/bash__deploy-nginx.yml | 4 ++-- .github/workflows/default__deploy-docker.yml | 2 +- .github/workflows/default__deploy-nginx.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bash__deploy-nginx.yml b/.github/workflows/bash__deploy-nginx.yml index 733a1e1..05d2325 100644 --- a/.github/workflows/bash__deploy-nginx.yml +++ b/.github/workflows/bash__deploy-nginx.yml @@ -3,12 +3,12 @@ name: Deploy Nginx with bash file on: push: branches: - - 'disabled-main' + - 'main' tags: - 'v[0-9]+.[0-9]+.[0-9]+' pull_request: branches: - - 'disabled-main' + - 'main' workflow_dispatch: env: diff --git a/.github/workflows/default__deploy-docker.yml b/.github/workflows/default__deploy-docker.yml index 55f410c..e0aca31 100644 --- a/.github/workflows/default__deploy-docker.yml +++ b/.github/workflows/default__deploy-docker.yml @@ -2,7 +2,7 @@ name: Deploy Docker on: workflow_run: - workflows: ['Build and push Docker - disabled'] + workflows: ['Build and push Docker'] types: - completed diff --git a/.github/workflows/default__deploy-nginx.yml b/.github/workflows/default__deploy-nginx.yml index cd56955..cc4b392 100644 --- a/.github/workflows/default__deploy-nginx.yml +++ b/.github/workflows/default__deploy-nginx.yml @@ -3,7 +3,7 @@ name: Deploy Nginx on: push: branches: - - 'main' + - 'disabled-main' tags: - 'v[0-9]+.[0-9]+.[0-9]+' pull_request: