From 947faddeb967385d4b17567ba3402698bf7ad93c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mauritz=20Skog=C3=B8y?= Date: Tue, 11 Mar 2025 17:18:16 +0100 Subject: [PATCH] Corrected workflows. Now server is configured correctly and workflows run on push to main --- .github/workflows/deploy_dev.yml | 6 +++++- .github/workflows/update_primary_nginx.yml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index f96f868..75923fb 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -1,6 +1,10 @@ name: Deploy to development -on: workflow_dispatch +on: + workflow_dispatch: + push: + branches: + - main jobs: deploy-dev: diff --git a/.github/workflows/update_primary_nginx.yml b/.github/workflows/update_primary_nginx.yml index e1de9c2..63d1f64 100644 --- a/.github/workflows/update_primary_nginx.yml +++ b/.github/workflows/update_primary_nginx.yml @@ -1,10 +1,10 @@ name: Deploy nginx configuration to TDT4242 server on: + workflow_dispatch: push: branches: - main - workflow_dispatch: jobs: deploy-nginx: