From 241854a7cc8407f88cc436e45547ab98541f1525 Mon Sep 17 00:00:00 2001 From: Timo De Meyst Date: Thu, 13 Mar 2025 16:49:39 +0100 Subject: [PATCH 1/5] chore: lint-action enkel uitvoeren op PRs die klaar zijn voor review --- .github/workflows/lint-action.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/lint-action.yml b/.github/workflows/lint-action.yml index e0f24ba9..b136a850 100644 --- a/.github/workflows/lint-action.yml +++ b/.github/workflows/lint-action.yml @@ -11,6 +11,8 @@ on: pull_request: branches: - dev + types: [ready_for_review] + # Down scope as necessary via https://docs.github.com/en/actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token permissions: From 4507f908e2f1e40eaee69e958851a0ac59f306a1 Mon Sep 17 00:00:00 2001 From: Timo De Meyst Date: Tue, 18 Mar 2025 09:36:04 +0100 Subject: [PATCH 2/5] actions: deployment workflow gemaakt --- .github/workflows/deployment.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/deployment.yml diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml new file mode 100644 index 00000000..674398ca --- /dev/null +++ b/.github/workflows/deployment.yml @@ -0,0 +1,25 @@ +name: Deployment + +on: + push: + branches: + - main + pull_request: + branches: + - main + types: + - closed + +jobs: + docker: + name: Deploy with docker + if: github.event.pull_request.merged == true + runs-on: [self-hosted, Linux, X64] + steps: + - + name: Checkout + uses: actions/checkout@v4 + - + name: Start docker + run: docker compose -f compose.yml -f compose.override.yml up --build -d + \ No newline at end of file From 3e4e786d914761f456c516307bee5b3ce0807ff3 Mon Sep 17 00:00:00 2001 From: Timo De Meyst Date: Tue, 18 Mar 2025 09:40:24 +0100 Subject: [PATCH 3/5] actions: deployment workflow update pull_request closed niet nodig --- .github/workflows/deployment.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 674398ca..090c56fa 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -4,16 +4,10 @@ on: push: branches: - main - pull_request: - branches: - - main - types: - - closed jobs: docker: name: Deploy with docker - if: github.event.pull_request.merged == true runs-on: [self-hosted, Linux, X64] steps: - From efb3aa5512cdd62c1f9267e687090fdd64cf27d8 Mon Sep 17 00:00:00 2001 From: Timo De Meyst Date: Tue, 18 Mar 2025 09:56:41 +0100 Subject: [PATCH 4/5] actions: update deployment workflow compose.override.yml verandert naar compose.prod.yml --- .github/workflows/deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 090c56fa..865f4524 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -15,5 +15,5 @@ jobs: uses: actions/checkout@v4 - name: Start docker - run: docker compose -f compose.yml -f compose.override.yml up --build -d + run: docker compose -f compose.yml -f compose.prod.yml up --build -d \ No newline at end of file From 50adbda3528c1a321871a04f4d4e60e67bd99c67 Mon Sep 17 00:00:00 2001 From: Timo De Meyst Date: Tue, 18 Mar 2025 19:24:02 +0100 Subject: [PATCH 5/5] chore: sync lint-action workflow Dit bestand is nu hetzelfde als op de branch voor de testing workflow om merge conflicts te vermijden Komt door mijn eigen slechte branching... --- .github/workflows/lint-action.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint-action.yml b/.github/workflows/lint-action.yml index b136a850..32823417 100644 --- a/.github/workflows/lint-action.yml +++ b/.github/workflows/lint-action.yml @@ -11,7 +11,7 @@ on: pull_request: branches: - dev - types: [ready_for_review] + types: ["synchronize", "ready_for_review", "opened", "reopened"] # Down scope as necessary via https://docs.github.com/en/actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token @@ -22,6 +22,7 @@ permissions: jobs: run-linters: name: Run linters + if: '! github.event.pull_request.draft' runs-on: [self-hosted, Linux, X64] steps: @@ -44,4 +45,4 @@ jobs: eslint: true eslint_args: '--config eslint.config.ts' prettier: true - commit_message: 'style: fix linting issues met ${linter}' + commit_message: 'style: fix linting issues met ${linter}' \ No newline at end of file