From d7246c41a1ce64bf08a7d09036a2d24b6fe2034e Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Mon, 4 Mar 2024 10:30:17 +0000 Subject: [PATCH 1/2] add a timeout minutes to the CI jobs This is just taking the implementation from https://github.com/ember-cli/ember-cli/pull/9760 which must have been added to ember-cli after we "forked" from there --- files/.github/workflows/ci.yml | 3 +++ files/.github/workflows/push-dist.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/files/.github/workflows/ci.yml b/files/.github/workflows/ci.yml index 0467ef7d..1b14b692 100644 --- a/files/.github/workflows/ci.yml +++ b/files/.github/workflows/ci.yml @@ -15,6 +15,7 @@ jobs: test: name: "Tests" runs-on: ubuntu-latest + timeout-minutes: 10 steps: - uses: actions/checkout@v4<% if (pnpm) { %> @@ -35,6 +36,7 @@ jobs: floating: name: "Floating Dependencies" runs-on: ubuntu-latest + timeout-minutes: 10 steps: - uses: actions/checkout@v4<% if (pnpm) { %> @@ -54,6 +56,7 @@ jobs: name: ${{ matrix.try-scenario }} runs-on: ubuntu-latest needs: 'test' + timeout-minutes: 10 strategy: fail-fast: false diff --git a/files/.github/workflows/push-dist.yml b/files/.github/workflows/push-dist.yml index c2b044ad..a5b36e4e 100644 --- a/files/.github/workflows/push-dist.yml +++ b/files/.github/workflows/push-dist.yml @@ -15,6 +15,8 @@ jobs: push-dist: name: Push dist runs-on: ubuntu-latest + timeout-minutes: 10 + steps: - uses: actions/checkout@v4<% if (pnpm) { %> - uses: pnpm/action-setup@v3 From 3067ece17b8c77e11c99a0527ec248a0da50ea1e Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Mon, 4 Mar 2024 14:16:35 +0000 Subject: [PATCH 2/2] fix timeout-minutes in test fixtures --- tests/fixtures/default/.github/workflows/ci.yml | 3 +++ tests/fixtures/default/.github/workflows/push-dist.yml | 2 ++ tests/fixtures/pnpm/.github/workflows/ci.yml | 3 +++ tests/fixtures/pnpm/.github/workflows/push-dist.yml | 2 ++ tests/fixtures/yarn/.github/workflows/ci.yml | 3 +++ tests/fixtures/yarn/.github/workflows/push-dist.yml | 2 ++ 6 files changed, 15 insertions(+) diff --git a/tests/fixtures/default/.github/workflows/ci.yml b/tests/fixtures/default/.github/workflows/ci.yml index 967e301a..eb9e3b13 100644 --- a/tests/fixtures/default/.github/workflows/ci.yml +++ b/tests/fixtures/default/.github/workflows/ci.yml @@ -15,6 +15,7 @@ jobs: test: name: "Tests" runs-on: ubuntu-latest + timeout-minutes: 10 steps: - uses: actions/checkout@v4 @@ -32,6 +33,7 @@ jobs: floating: name: "Floating Dependencies" runs-on: ubuntu-latest + timeout-minutes: 10 steps: - uses: actions/checkout@v4 @@ -48,6 +50,7 @@ jobs: name: ${{ matrix.try-scenario }} runs-on: ubuntu-latest needs: 'test' + timeout-minutes: 10 strategy: fail-fast: false diff --git a/tests/fixtures/default/.github/workflows/push-dist.yml b/tests/fixtures/default/.github/workflows/push-dist.yml index 78b61e25..3f0f66ab 100644 --- a/tests/fixtures/default/.github/workflows/push-dist.yml +++ b/tests/fixtures/default/.github/workflows/push-dist.yml @@ -15,6 +15,8 @@ jobs: push-dist: name: Push dist runs-on: ubuntu-latest + timeout-minutes: 10 + steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 diff --git a/tests/fixtures/pnpm/.github/workflows/ci.yml b/tests/fixtures/pnpm/.github/workflows/ci.yml index a02b804c..8f01c3a5 100644 --- a/tests/fixtures/pnpm/.github/workflows/ci.yml +++ b/tests/fixtures/pnpm/.github/workflows/ci.yml @@ -15,6 +15,7 @@ jobs: test: name: "Tests" runs-on: ubuntu-latest + timeout-minutes: 10 steps: - uses: actions/checkout@v4 @@ -35,6 +36,7 @@ jobs: floating: name: "Floating Dependencies" runs-on: ubuntu-latest + timeout-minutes: 10 steps: - uses: actions/checkout@v4 @@ -54,6 +56,7 @@ jobs: name: ${{ matrix.try-scenario }} runs-on: ubuntu-latest needs: 'test' + timeout-minutes: 10 strategy: fail-fast: false diff --git a/tests/fixtures/pnpm/.github/workflows/push-dist.yml b/tests/fixtures/pnpm/.github/workflows/push-dist.yml index b65713e6..4ab1e020 100644 --- a/tests/fixtures/pnpm/.github/workflows/push-dist.yml +++ b/tests/fixtures/pnpm/.github/workflows/push-dist.yml @@ -15,6 +15,8 @@ jobs: push-dist: name: Push dist runs-on: ubuntu-latest + timeout-minutes: 10 + steps: - uses: actions/checkout@v4 - uses: pnpm/action-setup@v3 diff --git a/tests/fixtures/yarn/.github/workflows/ci.yml b/tests/fixtures/yarn/.github/workflows/ci.yml index e1f59f5d..907ad3a8 100644 --- a/tests/fixtures/yarn/.github/workflows/ci.yml +++ b/tests/fixtures/yarn/.github/workflows/ci.yml @@ -15,6 +15,7 @@ jobs: test: name: "Tests" runs-on: ubuntu-latest + timeout-minutes: 10 steps: - uses: actions/checkout@v4 @@ -32,6 +33,7 @@ jobs: floating: name: "Floating Dependencies" runs-on: ubuntu-latest + timeout-minutes: 10 steps: - uses: actions/checkout@v4 @@ -48,6 +50,7 @@ jobs: name: ${{ matrix.try-scenario }} runs-on: ubuntu-latest needs: 'test' + timeout-minutes: 10 strategy: fail-fast: false diff --git a/tests/fixtures/yarn/.github/workflows/push-dist.yml b/tests/fixtures/yarn/.github/workflows/push-dist.yml index 29673bf9..d4ffd8d2 100644 --- a/tests/fixtures/yarn/.github/workflows/push-dist.yml +++ b/tests/fixtures/yarn/.github/workflows/push-dist.yml @@ -15,6 +15,8 @@ jobs: push-dist: name: Push dist runs-on: ubuntu-latest + timeout-minutes: 10 + steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v4