Add timeouts to CI pipelines, use default gitlab config location

davidje13 · Oct 28, 2023 · 833ac2b · 833ac2b
1 parent 23c7324
commit 833ac2b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,6 +12,7 @@ on:
 jobs:
   build_and_test:
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -43,6 +44,7 @@ jobs:
     needs:
       - build_and_test
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     strategy:
       fail-fast: false
       matrix:
@@ -98,6 +100,7 @@ jobs:
     needs:
       - smoke_test
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     if: ${{ github.ref == 'refs/heads/main' && github.head_ref == null }}
     permissions:
       contents: write

diff --git a/ci/gitlab.yml → .gitlab-ci.yml b/ci/gitlab.yml → .gitlab-ci.yml
@@ -1,3 +1,8 @@
+variables:
+  # Setting a depth of 1 can result in jobs failing if they are not the latest commit when they begin executing.
+  # See https://docs.gitlab.com/ee/ci/runners/configure_runners.html#shallow-cloning
+  GIT_DEPTH: '3'
+
 before_script:
 - apt-get update
 - wget --no-verbose https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
@@ -6,16 +11,19 @@ before_script:
 
 node:18:
   image: node:18
+  timeout: 20 minutes
   script:
   - PARALLEL_BUILD=false PARALLEL_E2E=false EXPLICIT_WAIT_TIMEOUT=20000 TEST_TIMEOUT=60000 DOCKER=true npm test
 
 node:20:
   image: node:20
+  timeout: 20 minutes
   script:
   - PARALLEL_BUILD=false PARALLEL_E2E=false EXPLICIT_WAIT_TIMEOUT=20000 TEST_TIMEOUT=60000 DOCKER=true npm test
 
 node:21:
   image: node:21
+  timeout: 20 minutes
   script:
   - PARALLEL_BUILD=false PARALLEL_E2E=false EXPLICIT_WAIT_TIMEOUT=20000 TEST_TIMEOUT=60000 DOCKER=true npm test