Skip to content

Commit

Permalink
Merge pull request #612 from adopted-ember-addons/fix-ci
Browse files Browse the repository at this point in the history
Resolve release/beta/canary failing test scenarios
  • Loading branch information
SergeAstapov authored Nov 14, 2024
2 parents 2c8b445 + 39bd4ed commit 673df6a
Show file tree
Hide file tree
Showing 14 changed files with 3,965 additions and 4,458 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v4
with:
version: 8
- run: pnpm i --frozen-lockfile
Expand All @@ -36,7 +36,7 @@ jobs:
matrix: ${{fromJson(needs.test.outputs.matrix)}}
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v4
with:
version: 8
- run: pnpm install --no-lockfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/plan-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
with:
node-version: 20.x

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v4
with:
version: 8
- run: pnpm install --frozen-lockfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
# This creates an .npmrc that reads the NODE_AUTH_TOKEN environment variable
registry-url: 'https://registry.npmjs.org'

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v4
with:
version: 8
- run: pnpm install --frozen-lockfile
Expand Down
16 changes: 4 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,29 +1,21 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/test-app/dist/
/test-app/tmp/
dist/

# dependencies
/node_modules/
/test-app/node_modules
node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/.eslintcache
.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try

.DS_Store
.DS_Store
2 changes: 1 addition & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ignore-workspace-root-check=true
use-node-version=20.11.0
use-node-version=20.18.0
36 changes: 17 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,9 @@
"ember-modifier": "^3.2.7 || ^4.0.0"
},
"devDependencies": {
"@babel/core": "^7.16.7",
"@babel/plugin-proposal-class-properties": "^7.16.7",
"@babel/plugin-proposal-decorators": "^7.16.7",
"@ember/optional-features": "^2.0.0",
"@babel/core": "^7.26.0",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-decorators": "^7.25.9",
"@ember/test-helpers": "^2.9.4",
"@embroider/addon-dev": "^4.1.3",
"@embroider/compat": "npm:@embroider/compat@latest",
Expand All @@ -58,26 +57,25 @@
"@glimmer/tracking": "^1.0.4",
"@rollup/plugin-babel": "^5.3.0",
"babel-eslint": "^10.1.0",
"ember-auto-import": "^2.3.0",
"ember-cli": "~3.28.6",
"ember-cli-babel": "^7.26.10",
"ember-cli-beta": "npm:ember-cli@beta",
"ember-cli-htmlbars": "^5.7.2",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-latest": "npm:ember-cli@latest",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.1",
"ember-maybe-import-regenerator": "1.0.0",
"ember-page-title": "^7.0.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-cli-lts-4.12": "npm:ember-cli@~4.12",
"ember-cli-lts-4.4": "npm:ember-cli@~4.4",
"ember-cli-lts-4.8": "npm:ember-cli@~4.8",
"ember-cli-lts-5.12": "npm:ember-cli@~5.12",
"ember-cli-lts-5.4": "npm:ember-cli@~5.4",
"ember-cli-lts-5.8": "npm:ember-cli@~5.8",
"ember-source": "~3.28.8",
"ember-source-beta": "npm:ember-source@beta",
"ember-source-canary": "npm:ember-source@alpha",
"ember-source-channel-url": "^3.0.0",
"ember-source-latest": "npm:ember-source@latest",
"ember-source-lts-4.4": "npm:ember-source@~4.4",
"ember-source-lts-4.8": "npm:ember-source@~4.8",
"ember-source-lts-4.12": "npm:ember-source@~4.12",
"ember-source-lts-5.4": "npm:ember-source@~5.4",
"ember-source-lts-5.8": "npm:ember-source@~5.8",
"ember-source-lts-5.12": "npm:ember-source@~5.12",
"ember-template-lint": "^3.15.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
Expand Down Expand Up @@ -108,8 +106,8 @@
}
},
"volta": {
"node": "20.11.0",
"yarn": "1.22.11"
"node": "20.18.0",
"pnpm": "8.15.9"
},
"ember-addon": {
"version": 2,
Expand Down
Loading

0 comments on commit 673df6a

Please sign in to comment.