Merge pull request #965 from blackflux/dev

[Gally]: master <- dev
blackflux · Aug 4, 2023 · 157301d · 157301d
2 parents a93be31 + 2e4ea77
commit 157301d
Show file tree

Hide file tree

Showing 12 changed files with 2,525 additions and 2,389 deletions.
diff --git a/.c8rc.json b/.c8rc.json
@@ -21,7 +21,7 @@
     "lcov",
     "text-summary"
   ],
-  "extension": [],
+  "extension": {},
   "all": true,
   "skip-full": true,
   "clean": true

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,45 +3,45 @@ workflows:
   node-multi-build:
     jobs:
       - gally-create-pr
-      - test-node-v16:
+      - test-node-v18:
           requires:
             - gally-create-pr
-      - test-node-v14:
+      - test-node-v16:
           requires:
             - gally-create-pr
-      - test-node-v17:
+      - test-node-v20:
           requires:
             - gally-create-pr
       - gally-auto-approve:
           requires:
             - gally-create-pr
+            - test-node-v18
             - test-node-v16
-            - test-node-v14
-            - test-node-v17
+            - test-node-v20
           filters:
             branches:
               only: /dependabot\/.*/
       - release:
           requires:
             - gally-create-pr
+            - test-node-v18
             - test-node-v16
-            - test-node-v14
-            - test-node-v17
+            - test-node-v20
           filters:
             branches:
               only: master
 version: 2
 jobs:
   gally-create-pr:
     docker:
-      - image: circleci/node:14
+      - image: cimg/node:16.20
     steps:
       - checkout
       - run: sudo yarn global add gally
       - run: ga promote $CIRCLE_BRANCH
   release:
     docker:
-      - image: circleci/node:14
+      - image: cimg/node:16.20
     steps:
       - checkout
       - run:
@@ -67,11 +67,11 @@ jobs:
           key: yarn-packages-{{ checksum "yarn.lock" }}
           paths:
             - ~/.cache/yarn
-      - run: yarn global add semantic-release
+      - run: yarn global add "semantic-release@^19.0.5"
       - run: yarn run semantic-release
   gally-auto-approve:
     docker:
-      - image: circleci/node:14
+      - image: cimg/node:16.20
     steps:
       - run:
           name: Set PR number
@@ -88,9 +88,9 @@ jobs:
       - run: >-
           ga approve $CIRCLE_PR_NUMBER --condition
           "base.ref=dev&state=open&user.login=dependabot-preview[bot]"
-  test-node-v14:
+  test-node-v16:
     docker:
-      - image: circleci/node:14
+      - image: cimg/node:16.20
     steps:
       - checkout
       - run:
@@ -120,14 +120,9 @@ jobs:
       - run: >-
           (git add . && git diff-index --quiet HEAD --) || (git status && exit
           1);
-      - run:
-          command: |
-            if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
-              yarn run coveralls
-            fi
-  test-node-v16:
+  test-node-v18:
     docker:
-      - image: circleci/node:16
+      - image: cimg/node:18.16
     steps:
       - checkout
       - run:
@@ -157,9 +152,9 @@ jobs:
       - run: >-
           (git add . && git diff-index --quiet HEAD --) || (git status && exit
           1);
-  test-node-v17:
+  test-node-v20:
     docker:
-      - image: circleci/node:17
+      - image: cimg/node:20.4
     steps:
       - checkout
       - run:

diff --git a/.gally.json b/.gally.json
@@ -23,12 +23,12 @@
         "strict": true,
         "contexts": [
           "ci/circleci: gally-create-pr",
+          "ci/circleci: test-node-v18",
           "ci/circleci: test-node-v16",
-          "ci/circleci: test-node-v14",
-          "ci/circleci: test-node-v17"
+          "ci/circleci: test-node-v20"
         ]
       },
-      "enforce_admins": true,
+      "enforce_admins": false,
       "required_pull_request_reviews": {
         "dismissal_restrictions": {"users": ["simlu"], "teams": []},
         "dismiss_stale_reviews": true,

diff --git a/.gitignore b/.gitignore
@@ -81,7 +81,6 @@ yarn-error.log
 
 # JS-Gardener Specific
 coverage/
-.coveralls.yml
 lib/
 
 # ----------------------------------------