Merge branch 'main' into dependabot/npm_and_yarn/init/follow-redirect…

…s-1.15.4
faros-ai · Mar 5, 2024 · 92605db · 92605db
2 parents 390d0a9 + 2f50c1e
commit 92605db
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 52 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -63,11 +63,18 @@ jobs:
       - name: Show services
         run: docker compose ps -a
 
+      # The init container is configured to restart 3 times on failure, but
+      # docker wait only uses the first exit code. This container's entrypoint
+      # always fails on its first attempt, but usually one retry is sufficient.
       - name: Wait for init to complete
-        run: |
-          CONTAINER_EXIT_CODE=$(docker wait faros-community-edition-faros-init-1)
-          echo "Faros init container exit code was ${CONTAINER_EXIT_CODE}"
-          [[ $CONTAINER_EXIT_CODE -eq 0 ]]
+        uses: nick-fields/retry@v3
+        with:
+          max_attempts: 2
+          timeout_minutes: 5
+          command: |
+            CONTAINER_EXIT_CODE=$(docker wait faros-community-edition-faros-init-1)
+            echo "Faros init container exit code was ${CONTAINER_EXIT_CODE}"
+            [[ $CONTAINER_EXIT_CODE -eq 0 ]]
 
       - name: Get Hasura Admin Secret
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -83,11 +83,16 @@ jobs:
       - name: Show services
         run: docker compose ps -a
 
+      # See comment on same step in PR workflow
       - name: Wait for init to complete
-        run: |
-          CONTAINER_EXIT_CODE=$(docker wait faros-community-edition-faros-init-1)
-          echo "Faros init container exit code was ${CONTAINER_EXIT_CODE}"
-          [[ $CONTAINER_EXIT_CODE -eq 0 ]]
+        uses: nick-fields/retry@v3
+        with:
+          max_attempts: 2
+          timeout_minutes: 5
+          command: |
+            CONTAINER_EXIT_CODE=$(docker wait faros-community-edition-faros-init-1)
+            echo "Faros init container exit code was ${CONTAINER_EXIT_CODE}"
+            [[ $CONTAINER_EXIT_CODE -eq 0 ]]
 
       - name: Get Hasura Admin Secret
         run: |

diff --git a/cli/package-lock.json b/cli/package-lock.json
diff --git a/cli/package.json b/cli/package.json
@@ -66,7 +66,7 @@
     "eslint": "^8.7.0",
     "eslint-plugin-simple-import-sort": "^7.0.0",
     "jest": "^27.5.1",
-    "nock": "^13.2.4",
+    "nock": "^13.5.1",
     "pino-pretty": "^7.5.1",
     "prettier": "2.5.1",
     "ts-jest": "^27.1.3",

diff --git a/init/package-lock.json b/init/package-lock.json
diff --git a/init/package.json b/init/package.json
@@ -57,7 +57,7 @@
     "eslint": "^8.7.0",
     "eslint-plugin-simple-import-sort": "^7.0.0",
     "jest": "^29.7.0",
-    "nock": "^13.2.4",
+    "nock": "^13.5.1",
     "pino-pretty": "^7.5.1",
     "prettier": "2.5.1",
     "ts-jest": "^29.1.1",