Partially Revert "CI: add branches filter (woodpecker-ci#1130)"

This partially reverts commit f9dd651.
simmstein · Dec 1, 2022 · 09ce7a0 · 09ce7a0
1 parent 0a0d4a2
commit 09ce7a0
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/.woodpecker/helm.yml b/.woodpecker/helm.yml
@@ -16,6 +16,7 @@ pipeline:
       - cat charts/woodpecker-agent/Chart.yaml
       - cat charts/woodpecker-server/Chart.yaml
     when:
+<<<<<<< HEAD
 <<<<<<< HEAD
       path: *when_path
 =======
@@ -24,13 +25,17 @@ pipeline:
           - "charts/**"
           - ".woodpecker/helm.yml"
 >>>>>>> 0bc9f79f (tmp)
+=======
+      path: *when_path
+>>>>>>> 7fede8ea (Partially Revert "CI: add branches filter (#1130)")
 
   lint:
     image: alpine/helm:3.5.3
     commands:
       - helm lint charts/woodpecker-agent/
       - helm lint charts/woodpecker-server/
     when:
+<<<<<<< HEAD
 <<<<<<< HEAD
       path: *when_path
 =======
@@ -39,6 +44,9 @@ pipeline:
           - "charts/**"
           - ".woodpecker/helm.yml"
 >>>>>>> 0bc9f79f (tmp)
+=======
+      path: *when_path
+>>>>>>> 7fede8ea (Partially Revert "CI: add branches filter (#1130)")
 
   release:
     image: quay.io/helmpack/chart-releaser:v1.4.0
@@ -56,6 +64,7 @@ pipeline:
       - cd woodpecker-ci.github.io/ && cr index --owner woodpecker-ci --git-repo woodpecker-ci.github.io --pages-branch master --package-path ../.cr-release-packages --index-path ../.cr-index/index.yaml --charts-repo https://woodpecker-ci.org --push --release-name-template "helm-{{ .Name }}-{{ .Version }}"
     when:
       event: tag
+<<<<<<< HEAD
 <<<<<<< HEAD
       path: *when_path
 =======
@@ -64,3 +73,6 @@ pipeline:
           - "charts/**"
           - ".woodpecker/helm.yml"
 >>>>>>> 0bc9f79f (tmp)
+=======
+      path: *when_path
+>>>>>>> 7fede8ea (Partially Revert "CI: add branches filter (#1130)")