Merge pull request #144 from peopledoc/revamp-gh-workflows

Revamp GitHub workflows using Ember.js native implementation
DazzlingFugu · Oct 13, 2021 · 21c61e2 · 21c61e2
2 parents b82131b + cbe621c
commit 21c61e2
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 191 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,213 +1,106 @@
-# This file was autogenerated by create-github-actions-setup-for-ember-addons.
-#
-# You can upgrade the GitHub Actions workflow to the latest blueprints used
-# by Create GitHub Actions setup for Ember Addons by running it again:
-#
-# - `yarn create github-actions-setup-for-ember-addons` if using yarn and
-# - `npm init github-actions-setup-for-ember-addons` if using NPM.
-#
-# See https://github.com/jelhan/create-github-actions-setup-for-ember-addon for
-# details.
-#
-# The following lines contain the configuration used in the last run. Please do
-# not change them. Doing so could break upgrade flow.
-#
-#$ browsers:
-#$   - chrome
-#$ emberTryScenarios:
-#$   - scenario: lts-3.20
-#$   - scenario: lts-3.24
-#$   - scenario: release
-#$   - scenario: default-with-jquery
-#$   - scenario: classic
-#$ nodeVersion: 12.x
-#$ packageManager: yarn
-#
-
 name: CI
 
 on:
   push:
     branches:
+      - main
       - master
-  pull_request:
+  pull_request: {}
 
 env:
-  NODE_VERSION: '12.x'
+  NODE_VERSION: '12'
 
 jobs:
   lint:
     name: Lint
     runs-on: ubuntu-latest
+    timeout-minutes: 20
+
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 1
-
-    - uses: actions/setup-node@v2-beta
-      with:
-        node-version: '${{ env.NODE_VERSION }}'
-
-    - name: Get package manager's global cache path
-      id: global-cache-dir-path
-      run: echo "::set-output name=dir::$(yarn cache dir)"
-
-    - name: Cache package manager's global cache and node_modules
-      id: cache-dependencies
-      uses: actions/cache@v2
-      with:
-        path: |
-          ${{ steps.global-cache-dir-path.outputs.dir }}
-          node_modules
-        key: ${{ runner.os }}-${{ matrix.node-version }}-${{
-          hashFiles('**/yarn.lock'
-          ) }}
-        restore-keys: |
-          ${{ runner.os }}-${{ matrix.node-version }}-
-
-    - name: Install Dependencies
-      run: yarn install --frozen-lockfile
-      if: |
-        steps.cache-dependencies.outputs.cache-hit != 'true'
-
-    - name: Lint
-      run: yarn lint
+      - uses: actions/checkout@v2
+
+      - name: Install Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: yarn
 
+      - name: Install Dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Lint
+        run: yarn run lint
 
   test:
     name: Tests
-    runs-on: ${{ matrix.os }}
     needs: lint
-
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        browser: [chrome]
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
 
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 1
-
-    - uses: actions/setup-node@v2-beta
-      with:
-        node-version: '${{ env.NODE_VERSION }}'
-
-    - name: Get package manager's global cache path
-      id: global-cache-dir-path
-      run: echo "::set-output name=dir::$(yarn cache dir)"
-
-    - name: Cache package manager's global cache and node_modules
-      id: cache-dependencies
-      uses: actions/cache@v2
-      with:
-        path: |
-          ${{ steps.global-cache-dir-path.outputs.dir }}
-          node_modules
-        key: ${{ runner.os }}-${{ matrix.node-version }}-${{
-          hashFiles('**/yarn.lock'
-          ) }}
-        restore-keys: |
-          ${{ runner.os }}-${{ matrix.node-version }}-
-
-    - name: Install Dependencies
-      run: yarn install --frozen-lockfile
-      if: |
-        steps.cache-dependencies.outputs.cache-hit != 'true'
-
-    - name: Test
-      run: yarn test:ember --launch ${{ matrix.browser }}
-
-
-  floating-dependencies:
-    name: Floating Dependencies
-    runs-on: ${{ matrix.os }}
-    needs: lint
+      - uses: actions/checkout@v2
 
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        browser: [chrome]
+      - name: Install Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: yarn
 
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 1
+      - name: Install Dependencies
+        run: yarn install --frozen-lockfile
 
-    - uses: actions/setup-node@v2-beta
-      with:
-        node-version: '${{ env.NODE_VERSION }}'
+      - name: Run Tests
+        run: yarn run test:ember
 
-    - name: Get package manager's global cache path
-      id: global-cache-dir-path
-      run: echo "::set-output name=dir::$(yarn cache dir)"
+  floating:
+    name: Floating Dependencies
+    needs: lint
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
 
-    - name: Cache package manager's global cache and node_modules
-      id: cache-dependencies
-      uses: actions/cache@v2
-      with:
-        path: |
-          ${{ steps.global-cache-dir-path.outputs.dir }}
-          node_modules
-        key: ${{ runner.os }}-${{ matrix.node-version }}-floating-deps
-        restore-keys: |
-          ${{ runner.os }}-${{ matrix.node-version }}-
+    steps:
+      - uses: actions/checkout@v2
 
-    - name: Install Dependencies
-      run: yarn install --no-lockfile --non-interactive
+      - uses: actions/setup-node@v2
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: yarn
 
-    - name: Test
-      run: yarn test:ember --launch ${{ matrix.browser }}
+      - name: Install Dependencies
+        run: yarn install --no-lockfile --non-interactive
 
+      - name: Run Tests
+        run: yarn run test:ember
 
   try-scenarios:
-    name: Tests - ${{ matrix.ember-try-scenario }}
-    runs-on: ubuntu-latest
-    continue-on-error: true
+    name: ${{ matrix.try-scenario }}
     needs: test
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
 
     strategy:
       fail-fast: true
       matrix:
-        ember-try-scenario:
-          - lts-3.20
-          - lts-3.24
-          - release
-          - default-with-jquery
-          - classic
+        try-scenario:
+          - ember-lts-3.20
+          - ember-lts-3.24
+          - ember-release
+          - ember-classic
+          - ember-default-with-jquery
+          - embroider-safe
+          - embroider-optimized
 
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 1
-
-    - uses: actions/setup-node@v2-beta
-      with:
-        node-version: '${{ env.NODE_VERSION }}'
-
-    - name: Get package manager's global cache path
-      id: global-cache-dir-path
-      run: echo "::set-output name=dir::$(yarn cache dir)"
-
-    - name: Cache package manager's global cache and node_modules
-      id: cache-dependencies
-      uses: actions/cache@v2
-      with:
-        path: |
-          ${{ steps.global-cache-dir-path.outputs.dir }}
-          node_modules
-        key: ${{ runner.os }}-${{ matrix.node-version }}-${{
-          hashFiles('**/yarn.lock'
-          ) }}
-        restore-keys: |
-          ${{ runner.os }}-${{ matrix.node-version }}-
-
-    - name: Install Dependencies
-      run: yarn install --frozen-lockfile
-      if: |
-        steps.cache-dependencies.outputs.cache-hit != 'true'
-
-    - name: Test
-      env:
-        EMBER_TRY_SCENARIO: ${{ matrix.ember-try-scenario }}
-      run: node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
+      - uses: actions/checkout@v2
+
+      - name: Install Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: yarn
+
+      - name: Install Dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Run Tests
+        run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -9,41 +9,31 @@ module.exports = async function () {
     useYarn: true,
     scenarios: [
       {
-        name: 'lts-3.20',
+        name: 'ember-lts-3.20',
         npm: {
           devDependencies: {
             'ember-source': '~3.20.5',
           },
         },
       },
       {
-        name: 'lts-3.24',
+        name: 'ember-lts-3.24',
         npm: {
           devDependencies: {
             'ember-source': '~3.24.3',
           },
         },
       },
       {
-        name: 'release',
+        name: 'ember-release',
         npm: {
           devDependencies: {
             'ember-source': await getChannelURL('release'),
           },
         },
       },
-      // The default `.travis.yml` runs this scenario via `npm test`,
-      // not via `ember try`. It's still included here so that running
-      // `ember try:each` manually or from a customized CI config will run it
-      // along with all the other scenarios.
       {
-        name: 'default',
-        npm: {
-          devDependencies: {},
-        },
-      },
-      {
-        name: 'default-with-jquery',
+        name: 'ember-default-with-jquery',
         env: {
           EMBER_OPTIONAL_FEATURES: JSON.stringify({
             'jquery-integration': true,
@@ -56,7 +46,7 @@ module.exports = async function () {
         },
       },
       {
-        name: 'classic',
+        name: 'ember-classic',
         env: {
           EMBER_OPTIONAL_FEATURES: JSON.stringify({
             'application-template-wrapper': true,

diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
   },
   "scripts": {
     "build": "ember build --environment=production",
-    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'",
+    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
     "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
     "lint:hbs": "ember-template-lint .",
     "lint:hbs:fix": "ember-template-lint . --fix",