ci: build-all and build-macos on all ci runs

2022-05-02 20:36:13 +00:00 · 2022-05-02 20:36:13 +00:00 · 415b506a85
commit 415b506a85
parent d6618c75a0
2 changed files with 4 additions and 26 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -1000,11 +1000,7 @@ workflows:
              only:
                - master
      - build-debug
-      - build-all:
-          filters:
-            tags:
-              only:
-                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
+      - build-all
      - build-ntwk-calibration:
          filters:
            tags:
@ -1016,14 +1012,7 @@ workflows:
              only:
                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
      - build-lotus-soup
-      - build-macos:
-          filters:
-            branches:
-              ignore:
-                - /.*/
-            tags:
-              only:
-                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
+      - build-macos
      - build-appimage:
          filters:
            branches:
--- a/.circleci/template.yml
+++ b/.circleci/template.yml
@ -800,11 +800,7 @@ workflows:
              only:
                - master
      - build-debug
-      - build-all:
-          filters:
-            tags:
-              only:
-                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
+      - build-all
      - build-ntwk-calibration:
          filters:
            tags:
@ -816,14 +812,7 @@ workflows:
              only:
                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
      - build-lotus-soup
-      - build-macos:
-          filters:
-            branches:
-              ignore:
-                - /.*/
-            tags:
-              only:
-                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
+      - build-macos
      - build-appimage:
          filters:
            branches: