From 89325cce84d7aad74d2094b44c2be298abc590af Mon Sep 17 00:00:00 2001 From: Till Frankenbach Date: Tue, 3 Dec 2024 09:23:20 +0100 Subject: [PATCH 1/5] fix: adapt workflow trigger --- .github/workflows/ruff.yml | 6 +++++- .github/workflows/test.yml | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml index 12961605..e42622ae 100644 --- a/.github/workflows/ruff.yml +++ b/.github/workflows/ruff.yml @@ -1,5 +1,9 @@ name: Ruff -on: [ push, pull_request ] + +on: + pull_request: + push: + jobs: ruff: runs-on: ubuntu-latest diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 08ccf6d4..6219a166 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,6 +3,7 @@ name: Testing on: pull_request: + push: jobs: test_3_16: From fc747bb36e25a7fd470fb6aae077484fe606e5fc Mon Sep 17 00:00:00 2001 From: Till Frankenbach Date: Tue, 3 Dec 2024 09:25:31 +0100 Subject: [PATCH 2/5] fix: set bandges to change on main branch actions only --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ad3f5675..3a1ba725 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # ORS Tools QGIS plugin -![Testing](https://github.com/GIScience/orstools-qgis-plugin/actions/workflows/test.yml/badge.svg) -![Ruff](https://github.com/GIScience/orstools-qgis-plugin/actions/workflows/ruff.yml/badge.svg) +![Testing](https://github.com/GIScience/orstools-qgis-plugin/actions/workflows/test.yml/badge.svg?branch=main) +![Ruff](https://github.com/GIScience/orstools-qgis-plugin/actions/workflows/ruff.yml/badge.svg?branch=main) ![ORS Tools](https://user-images.githubusercontent.com/23240110/122937401-3ee72400-d372-11eb-8e3b-6c435d1dd964.png) From 74e50fd9f555667ef40eee80da56658e2a970f56 Mon Sep 17 00:00:00 2001 From: Till Frankenbach Date: Tue, 3 Dec 2024 09:37:13 +0100 Subject: [PATCH 3/5] fix: test push trigger of test.yml --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3a1ba725..84d5d22e 100644 --- a/README.md +++ b/README.md @@ -353,3 +353,4 @@ openrouteservice. ## Acknowledgements This project was first started by [Nils Nolde](https://github.com/nilsnolde). + From 110baa6ab470b2b7ad50abd4d308f82050d72d29 Mon Sep 17 00:00:00 2001 From: Till Frankenbach Date: Tue, 3 Dec 2024 09:43:28 +0100 Subject: [PATCH 4/5] Revert "fix: test push trigger of test.yml" This reverts commit 74e50fd9f555667ef40eee80da56658e2a970f56. --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 84d5d22e..3a1ba725 100644 --- a/README.md +++ b/README.md @@ -353,4 +353,3 @@ openrouteservice. ## Acknowledgements This project was first started by [Nils Nolde](https://github.com/nilsnolde). - From 64b351f8b996f896e2ad4a78c6385640b16b02a3 Mon Sep 17 00:00:00 2001 From: Till Frankenbach Date: Tue, 3 Dec 2024 10:12:51 +0100 Subject: [PATCH 5/5] fix: correct indentation --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6219a166..e5e71173 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,7 +3,7 @@ name: Testing on: pull_request: - push: + push: jobs: test_3_16: