From bf02665ed87fb64ee4e308f4c3e75ed8d3f9a876 Mon Sep 17 00:00:00 2001 From: MrChocolatine <47531779+MrChocolatine@users.noreply.github.com> Date: Mon, 1 Nov 2021 20:35:04 +0000 Subject: [PATCH 1/3] build: update `ember-cli` to version 3.28.3 --- config/ember-try.js | 3 +++ package.json | 2 +- tests/dummy/config/ember-cli-update.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/config/ember-try.js b/config/ember-try.js index 42f4a1e..3e0c577 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -70,6 +70,9 @@ module.exports = async function () { }), }, npm: { + devDependencies: { + 'ember-source': '~3.28.0', + }, ember: { edition: 'classic', }, diff --git a/package.json b/package.json index 1f3baee..5562010 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "@glimmer/tracking": "^1.0.4", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", - "ember-cli": "~3.28.0", + "ember-cli": "~3.28.3", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", diff --git a/tests/dummy/config/ember-cli-update.json b/tests/dummy/config/ember-cli-update.json index fb45127..a868771 100644 --- a/tests/dummy/config/ember-cli-update.json +++ b/tests/dummy/config/ember-cli-update.json @@ -3,7 +3,7 @@ "packages": [ { "name": "ember-cli", - "version": "3.28.1", + "version": "3.28.3", "blueprints": [ { "name": "addon", diff --git a/yarn.lock b/yarn.lock index b039a2c..8589e4d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4935,10 +4935,10 @@ ember-cli-version-checker@^5.1.1, ember-cli-version-checker@^5.1.2: semver "^7.3.4" silent-error "^1.1.1" -ember-cli@~3.28.0: - version "3.28.1" - resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.28.1.tgz#ba32fa6844ac3059bfe9fab355c6f8386dc81fed" - integrity sha512-1SgI4RWJor4yyQIZJvz1egPTYeNUwO5cm4YFXfozU1e5iKcIHM8M2UrGCf3GSGyaFptIxMaDBD3o7GJBnrAb1g== +ember-cli@~3.28.3: + version "3.28.3" + resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.28.3.tgz#3384c3fb018b58111e30efed15a2f6a9b66b84c3" + integrity sha512-DddAQAddbyaOU4NAjTt8g+FoCCK/F00kbj9pcHO1lfAUpIUS9JPBoWxxZ3qO08mUNXi50pdQSPVVRWzN7mNz2g== dependencies: "@babel/core" "^7.13.8" "@babel/plugin-transform-modules-amd" "^7.12.1" From 0cfbdf0bd982e5d102d0f19f23de324a9b2cbcc8 Mon Sep 17 00:00:00 2001 From: MrChocolatine <47531779+MrChocolatine@users.noreply.github.com> Date: Mon, 1 Nov 2021 20:35:57 +0000 Subject: [PATCH 2/3] build: update `@embroider/test-setup@0.47.1` --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 5562010..f0d9af6 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "devDependencies": { "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", - "@embroider/test-setup": "^0.43.5", + "@embroider/test-setup": "^0.47.1", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", "babel-eslint": "^10.1.0", diff --git a/yarn.lock b/yarn.lock index 8589e4d..24a3e37 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1074,10 +1074,10 @@ resolve "^1.8.1" semver "^7.3.2" -"@embroider/test-setup@^0.43.5": - version "0.43.5" - resolved "https://registry.yarnpkg.com/@embroider/test-setup/-/test-setup-0.43.5.tgz#79944cb50038802cc71d50aa0d5d7a0955ee6349" - integrity sha512-ke+5B0VR2343ZrOqV9Ok2LyA4m2q2ApM1Oy1RC8+3+OI5lDVg8UgZG9n/G2e77KPMFxnK3eVpXcPdLcdOxW6+w== +"@embroider/test-setup@^0.47.1": + version "0.47.1" + resolved "https://registry.yarnpkg.com/@embroider/test-setup/-/test-setup-0.47.1.tgz#01f6921612b292cb721b2102b3f40dbc89131039" + integrity sha512-PKV+UBixVmkrXo/9AdrtvBccmTbTG9zgJUA/hvoHIGaUISW5cepWyLU0dqW3gE2ECJjrvc4+KtBUMOC1rEZ2Ng== dependencies: lodash "^4.17.21" resolve "^1.20.0" From 9b50a116600e6a23e656f9c540fb7e689358f09f Mon Sep 17 00:00:00 2001 From: MrChocolatine <47531779+MrChocolatine@users.noreply.github.com> Date: Mon, 1 Nov 2021 20:37:09 +0000 Subject: [PATCH 3/3] ci: reuse organisation's workflows --- .github/workflows/ci.yml | 201 +--------------------- .github/workflows/tag-release-publish.yml | 21 +++ 2 files changed, 30 insertions(+), 192 deletions(-) create mode 100644 .github/workflows/tag-release-publish.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4550076..f2f372f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,200 +1,17 @@ -# 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: ember-lts-3.20 -#$ - scenario: ember-lts-3.24 -#$ - scenario: ember-release -#$ - scenario: ember-default-with-jquery -#$ - scenario: ember-classic -#$ nodeVersion: '12' -#$ packageManager: yarn -# +# GitHub Actions documentation: +# https://docs.github.com/en/actions name: CI on: push: - branches: - - master - pull_request: + branches: master + pull_request: {} -env: - NODE_VERSION: '12' +concurrency: + group: ci-${{ github.head_ref || github.ref }} + cancel-in-progress: true jobs: - lint: - name: Lint - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 1 - - - uses: actions/setup-node@v2 - 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 - - - test: - name: Tests - runs-on: ${{ matrix.os }} - needs: lint - - strategy: - matrix: - os: [ubuntu-latest] - browser: [Chrome] - - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 1 - - - uses: actions/setup-node@v2 - 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 - - strategy: - matrix: - os: [ubuntu-latest] - browser: [Chrome] - - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 1 - - - uses: actions/setup-node@v2 - 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 }}-floating-deps - restore-keys: ${{ runner.os }}-${{ matrix.node-version }}- - - - name: Install Dependencies - run: yarn install --no-lockfile --non-interactive - - - name: Test - run: yarn test:ember --launch ${{ matrix.browser }} - - - try-scenarios: - name: Tests - ${{ matrix.ember-try-scenario }} - runs-on: ubuntu-latest - continue-on-error: true - needs: test - - strategy: - fail-fast: true - matrix: - ember-try-scenario: - - ember-lts-3.20 - - ember-lts-3.24 - - ember-release - - ember-default-with-jquery - - ember-classic - - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 1 - - - uses: actions/setup-node@v2 - 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 + org: + uses: peopledoc/.github/.github/workflows/js--emberjs-addons-ci.yml@main diff --git a/.github/workflows/tag-release-publish.yml b/.github/workflows/tag-release-publish.yml new file mode 100644 index 0000000..a9460b9 --- /dev/null +++ b/.github/workflows/tag-release-publish.yml @@ -0,0 +1,21 @@ +# GitHub Actions documentation: +# https://docs.github.com/en/actions + +name: Create new `git tag`, create new GitHub release and publish to NPM + +on: + workflow_run: + workflows: CI + branches: master + types: completed + +concurrency: + group: tag-release-publish-${{ github.ref }} + cancel-in-progress: true + +jobs: + org: + if: ${{ github.event.workflow_run.conclusion == 'success' }} + uses: peopledoc/.github/.github/workflows/js--tag-release-publish.yml@main + secrets: + npm_automation_token: ${{ secrets.NPM_AUTOMATION_TOKEN }}