From 3cf176b3368810e7861feaef643fdea0c2cee808 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Thu, 5 Dec 2019 14:06:16 -0500 Subject: [PATCH 1/7] fix nightly.yml --- .github/workflows/nightly.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 4a3c6e484ae..e1feb9475f0 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -3,8 +3,6 @@ name: 'Nightly' on: schedule: - cron: '* 14 * * *' # 14:00 in UTC is 6am PST - branches: - - master jobs: test-all-deprecations: From 5ad039ed577be761cba2f11ab977bef02a08ca57 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Thu, 5 Dec 2019 14:20:41 -0500 Subject: [PATCH 2/7] add pull request event --- .github/workflows/nightly.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index e1feb9475f0..f4ef8119704 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1,6 +1,9 @@ name: 'Nightly' on: + pull_request: + branches: + - master schedule: - cron: '* 14 * * *' # 14:00 in UTC is 6am PST From 517f11a5f4cf0473492c7ec1821dbc6f1b505f63 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Thu, 5 Dec 2019 14:34:55 -0500 Subject: [PATCH 3/7] more fixes --- .github/workflows/nightly.yml | 4 ---- .../testem.js | 14 ++++++++++++-- .../testem.js | 14 ++++++++++++-- .../unpublished-fastboot-test-app/testem.js | 13 +++++++++++-- .../testem.js | 14 ++++++++++++-- .../testem.js | 14 ++++++++++++-- .../testem.js | 18 ++++++++++++++---- .../testem.js | 14 ++++++++++++-- 8 files changed, 85 insertions(+), 20 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index f4ef8119704..2e28874c1fc 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -9,10 +9,6 @@ on: jobs: test-all-deprecations: - strategy: - fail-fast: false - matrix: - scenario: [ember-beta, ember-canary] runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 diff --git a/packages/unpublished-adapter-encapsulation-test-app/testem.js b/packages/unpublished-adapter-encapsulation-test-app/testem.js index 43c34e3ebd1..35513d2b925 100644 --- a/packages/unpublished-adapter-encapsulation-test-app/testem.js +++ b/packages/unpublished-adapter-encapsulation-test-app/testem.js @@ -1,9 +1,19 @@ +const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem/custom-dot-reporter'); + +const TestIE = process.env.TEST_IE11; + +if (TestIE) { + // eslint-disable-next-line no-console + console.log('\n\nLaunching with IE\n\n'); +} + module.exports = { test_page: 'tests/index.html?hidepassed', disable_watching: true, - reporter: 'dot', - launch_in_ci: ['Chrome'], + reporter: customDotReporter, + launch_in_ci: TestIE ? ['IE'] : ['Chrome'], launch_in_dev: ['Chrome'], + browser_start_timeout: 120, browser_args: { Chrome: { ci: [ diff --git a/packages/unpublished-debug-encapsulation-test-app/testem.js b/packages/unpublished-debug-encapsulation-test-app/testem.js index 43c34e3ebd1..35513d2b925 100644 --- a/packages/unpublished-debug-encapsulation-test-app/testem.js +++ b/packages/unpublished-debug-encapsulation-test-app/testem.js @@ -1,9 +1,19 @@ +const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem/custom-dot-reporter'); + +const TestIE = process.env.TEST_IE11; + +if (TestIE) { + // eslint-disable-next-line no-console + console.log('\n\nLaunching with IE\n\n'); +} + module.exports = { test_page: 'tests/index.html?hidepassed', disable_watching: true, - reporter: 'dot', - launch_in_ci: ['Chrome'], + reporter: customDotReporter, + launch_in_ci: TestIE ? ['IE'] : ['Chrome'], launch_in_dev: ['Chrome'], + browser_start_timeout: 120, browser_args: { Chrome: { ci: [ diff --git a/packages/unpublished-fastboot-test-app/testem.js b/packages/unpublished-fastboot-test-app/testem.js index 47a70437807..35513d2b925 100644 --- a/packages/unpublished-fastboot-test-app/testem.js +++ b/packages/unpublished-fastboot-test-app/testem.js @@ -1,8 +1,17 @@ +const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem/custom-dot-reporter'); + +const TestIE = process.env.TEST_IE11; + +if (TestIE) { + // eslint-disable-next-line no-console + console.log('\n\nLaunching with IE\n\n'); +} + module.exports = { test_page: 'tests/index.html?hidepassed', disable_watching: true, - reporter: 'dot', - launch_in_ci: ['Chrome'], + reporter: customDotReporter, + launch_in_ci: TestIE ? ['IE'] : ['Chrome'], launch_in_dev: ['Chrome'], browser_start_timeout: 120, browser_args: { diff --git a/packages/unpublished-model-encapsulation-test-app/testem.js b/packages/unpublished-model-encapsulation-test-app/testem.js index 43c34e3ebd1..35513d2b925 100644 --- a/packages/unpublished-model-encapsulation-test-app/testem.js +++ b/packages/unpublished-model-encapsulation-test-app/testem.js @@ -1,9 +1,19 @@ +const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem/custom-dot-reporter'); + +const TestIE = process.env.TEST_IE11; + +if (TestIE) { + // eslint-disable-next-line no-console + console.log('\n\nLaunching with IE\n\n'); +} + module.exports = { test_page: 'tests/index.html?hidepassed', disable_watching: true, - reporter: 'dot', - launch_in_ci: ['Chrome'], + reporter: customDotReporter, + launch_in_ci: TestIE ? ['IE'] : ['Chrome'], launch_in_dev: ['Chrome'], + browser_start_timeout: 120, browser_args: { Chrome: { ci: [ diff --git a/packages/unpublished-record-data-encapsulation-test-app/testem.js b/packages/unpublished-record-data-encapsulation-test-app/testem.js index 43c34e3ebd1..35513d2b925 100644 --- a/packages/unpublished-record-data-encapsulation-test-app/testem.js +++ b/packages/unpublished-record-data-encapsulation-test-app/testem.js @@ -1,9 +1,19 @@ +const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem/custom-dot-reporter'); + +const TestIE = process.env.TEST_IE11; + +if (TestIE) { + // eslint-disable-next-line no-console + console.log('\n\nLaunching with IE\n\n'); +} + module.exports = { test_page: 'tests/index.html?hidepassed', disable_watching: true, - reporter: 'dot', - launch_in_ci: ['Chrome'], + reporter: customDotReporter, + launch_in_ci: TestIE ? ['IE'] : ['Chrome'], launch_in_dev: ['Chrome'], + browser_start_timeout: 120, browser_args: { Chrome: { ci: [ diff --git a/packages/unpublished-relationship-performance-test-app/testem.js b/packages/unpublished-relationship-performance-test-app/testem.js index 4d4cfe72336..35513d2b925 100644 --- a/packages/unpublished-relationship-performance-test-app/testem.js +++ b/packages/unpublished-relationship-performance-test-app/testem.js @@ -1,20 +1,30 @@ +const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem/custom-dot-reporter'); + +const TestIE = process.env.TEST_IE11; + +if (TestIE) { + // eslint-disable-next-line no-console + console.log('\n\nLaunching with IE\n\n'); +} + module.exports = { test_page: 'tests/index.html?hidepassed', disable_watching: true, - launch_in_ci: ['Chrome'], + reporter: customDotReporter, + launch_in_ci: TestIE ? ['IE'] : ['Chrome'], launch_in_dev: ['Chrome'], + browser_start_timeout: 120, browser_args: { Chrome: { ci: [ - // --no-sandbox is needed when running Chrome inside a container - process.env.CI ? '--no-sandbox' : null, '--headless', '--disable-dev-shm-usage', '--disable-software-rasterizer', '--mute-audio', '--remote-debugging-port=0', '--window-size=1440,900', - ].filter(Boolean), + '--no-sandbox', + ], }, }, }; diff --git a/packages/unpublished-serializer-encapsulation-test-app/testem.js b/packages/unpublished-serializer-encapsulation-test-app/testem.js index 43c34e3ebd1..35513d2b925 100644 --- a/packages/unpublished-serializer-encapsulation-test-app/testem.js +++ b/packages/unpublished-serializer-encapsulation-test-app/testem.js @@ -1,9 +1,19 @@ +const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem/custom-dot-reporter'); + +const TestIE = process.env.TEST_IE11; + +if (TestIE) { + // eslint-disable-next-line no-console + console.log('\n\nLaunching with IE\n\n'); +} + module.exports = { test_page: 'tests/index.html?hidepassed', disable_watching: true, - reporter: 'dot', - launch_in_ci: ['Chrome'], + reporter: customDotReporter, + launch_in_ci: TestIE ? ['IE'] : ['Chrome'], launch_in_dev: ['Chrome'], + browser_start_timeout: 120, browser_args: { Chrome: { ci: [ From decbf7dee41c3e708d391f0a9b4bc55f798a938c Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Thu, 5 Dec 2019 14:42:25 -0500 Subject: [PATCH 4/7] remove pull request trigger for nightly job --- .github/workflows/nightly.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 2e28874c1fc..1c1b6d4aba1 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1,9 +1,6 @@ name: 'Nightly' on: - pull_request: - branches: - - master schedule: - cron: '* 14 * * *' # 14:00 in UTC is 6am PST From 778a3fdbf1609295411a64cae3bda959e0b01812 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Thu, 5 Dec 2019 14:52:58 -0500 Subject: [PATCH 5/7] fix lint --- packages/unpublished-adapter-encapsulation-test-app/testem.js | 1 + packages/unpublished-debug-encapsulation-test-app/testem.js | 1 + packages/unpublished-fastboot-test-app/testem.js | 1 + packages/unpublished-model-encapsulation-test-app/testem.js | 1 + .../unpublished-record-data-encapsulation-test-app/testem.js | 1 + packages/unpublished-relationship-performance-test-app/testem.js | 1 + packages/unpublished-serializer-encapsulation-test-app/testem.js | 1 + 7 files changed, 7 insertions(+) diff --git a/packages/unpublished-adapter-encapsulation-test-app/testem.js b/packages/unpublished-adapter-encapsulation-test-app/testem.js index 35513d2b925..04cb091de43 100644 --- a/packages/unpublished-adapter-encapsulation-test-app/testem.js +++ b/packages/unpublished-adapter-encapsulation-test-app/testem.js @@ -1,3 +1,4 @@ +// eslint-disable-next-line node/no-unpublished-require const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem/custom-dot-reporter'); const TestIE = process.env.TEST_IE11; diff --git a/packages/unpublished-debug-encapsulation-test-app/testem.js b/packages/unpublished-debug-encapsulation-test-app/testem.js index 35513d2b925..04cb091de43 100644 --- a/packages/unpublished-debug-encapsulation-test-app/testem.js +++ b/packages/unpublished-debug-encapsulation-test-app/testem.js @@ -1,3 +1,4 @@ +// eslint-disable-next-line node/no-unpublished-require const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem/custom-dot-reporter'); const TestIE = process.env.TEST_IE11; diff --git a/packages/unpublished-fastboot-test-app/testem.js b/packages/unpublished-fastboot-test-app/testem.js index 35513d2b925..04cb091de43 100644 --- a/packages/unpublished-fastboot-test-app/testem.js +++ b/packages/unpublished-fastboot-test-app/testem.js @@ -1,3 +1,4 @@ +// eslint-disable-next-line node/no-unpublished-require const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem/custom-dot-reporter'); const TestIE = process.env.TEST_IE11; diff --git a/packages/unpublished-model-encapsulation-test-app/testem.js b/packages/unpublished-model-encapsulation-test-app/testem.js index 35513d2b925..04cb091de43 100644 --- a/packages/unpublished-model-encapsulation-test-app/testem.js +++ b/packages/unpublished-model-encapsulation-test-app/testem.js @@ -1,3 +1,4 @@ +// eslint-disable-next-line node/no-unpublished-require const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem/custom-dot-reporter'); const TestIE = process.env.TEST_IE11; diff --git a/packages/unpublished-record-data-encapsulation-test-app/testem.js b/packages/unpublished-record-data-encapsulation-test-app/testem.js index 35513d2b925..04cb091de43 100644 --- a/packages/unpublished-record-data-encapsulation-test-app/testem.js +++ b/packages/unpublished-record-data-encapsulation-test-app/testem.js @@ -1,3 +1,4 @@ +// eslint-disable-next-line node/no-unpublished-require const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem/custom-dot-reporter'); const TestIE = process.env.TEST_IE11; diff --git a/packages/unpublished-relationship-performance-test-app/testem.js b/packages/unpublished-relationship-performance-test-app/testem.js index 35513d2b925..04cb091de43 100644 --- a/packages/unpublished-relationship-performance-test-app/testem.js +++ b/packages/unpublished-relationship-performance-test-app/testem.js @@ -1,3 +1,4 @@ +// eslint-disable-next-line node/no-unpublished-require const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem/custom-dot-reporter'); const TestIE = process.env.TEST_IE11; diff --git a/packages/unpublished-serializer-encapsulation-test-app/testem.js b/packages/unpublished-serializer-encapsulation-test-app/testem.js index 35513d2b925..04cb091de43 100644 --- a/packages/unpublished-serializer-encapsulation-test-app/testem.js +++ b/packages/unpublished-serializer-encapsulation-test-app/testem.js @@ -1,3 +1,4 @@ +// eslint-disable-next-line node/no-unpublished-require const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem/custom-dot-reporter'); const TestIE = process.env.TEST_IE11; From 3290ad508a99062154e1bac658fb0848b5000e1e Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Thu, 5 Dec 2019 15:00:54 -0500 Subject: [PATCH 6/7] Revert "remove pull request trigger for nightly job" This reverts commit decbf7dee41c3e708d391f0a9b4bc55f798a938c. --- .github/workflows/nightly.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 1c1b6d4aba1..2e28874c1fc 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1,6 +1,9 @@ name: 'Nightly' on: + pull_request: + branches: + - master schedule: - cron: '* 14 * * *' # 14:00 in UTC is 6am PST From febab6c4162e2312a1df76810bd913459e7a3145 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Thu, 5 Dec 2019 15:20:12 -0500 Subject: [PATCH 7/7] Revert "Revert "remove pull request trigger for nightly job"" This reverts commit 3290ad508a99062154e1bac658fb0848b5000e1e. --- .github/workflows/nightly.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 2e28874c1fc..1c1b6d4aba1 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1,9 +1,6 @@ name: 'Nightly' on: - pull_request: - branches: - - master schedule: - cron: '* 14 * * *' # 14:00 in UTC is 6am PST