Skip to content

Commit 64eae90

Browse files
authored
Merge branch 'fenichelar:master' into remove-use-of-assign-polyfill
2 parents 92aa76c + 275e692 commit 64eae90

File tree

5 files changed

+173
-61
lines changed

5 files changed

+173
-61
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: "CodeQL"
2+
3+
on:
4+
push:
5+
branches: [ "master" ]
6+
pull_request:
7+
branches: [ "master" ]
8+
schedule:
9+
- cron: '45 15 * * 3'
10+
11+
jobs:
12+
analyze:
13+
name: Analyze
14+
runs-on: ubuntu-latest
15+
permissions:
16+
actions: read
17+
contents: read
18+
security-events: write
19+
20+
strategy:
21+
fail-fast: false
22+
matrix:
23+
language: [ 'javascript' ]
24+
25+
steps:
26+
- name: Checkout repository
27+
uses: actions/checkout@v3
28+
29+
- name: Initialize CodeQL
30+
uses: github/codeql-action/init@v2
31+
with:
32+
languages: ${{ matrix.language }}
33+
34+
- name: Perform CodeQL Analysis
35+
uses: github/codeql-action/analyze@v2

.github/workflows/test.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,21 @@ jobs:
3939
- ember-lts-3.24-ember-simple-auth-2.0
4040
- ember-lts-3.24-ember-simple-auth-3.0
4141
- ember-lts-3.24-ember-simple-auth-4.0
42-
- ember-release-ember-simple-auth-1.6
43-
- ember-release-ember-simple-auth-2.0
44-
- ember-release-ember-simple-auth-3.0
45-
- ember-release-ember-simple-auth-4.0
42+
- ember-lts-3.28-ember-simple-auth-1.6
43+
- ember-lts-3.28-ember-simple-auth-2.0
44+
- ember-lts-3.28-ember-simple-auth-3.0
45+
- ember-lts-3.28-ember-simple-auth-4.0
4646
experimental:
4747
- false
4848
include:
49+
- scenario: ember-release-ember-simple-auth-1.6
50+
experimental: true
51+
- scenario: ember-release-ember-simple-auth-2.0
52+
experimental: true
53+
- scenario: ember-release-ember-simple-auth-3.0
54+
experimental: true
55+
- scenario: ember-release-ember-simple-auth-4.0
56+
experimental: true
4957
- scenario: ember-beta-ember-simple-auth-1.6
5058
experimental: true
5159
- scenario: ember-beta-ember-simple-auth-2.0

config/ember-try.js

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,52 @@ module.exports = function() {
334334
}
335335
}
336336
},
337+
{
338+
name: 'ember-lts-3.28-ember-simple-auth-1.6',
339+
npm: {
340+
dependencies: {
341+
'ember-simple-auth': '^1.6.0',
342+
'whatwg-fetch': '3.3.1'
343+
},
344+
devDependencies: {
345+
'ember-source': '~3.28.0'
346+
}
347+
}
348+
},
349+
{
350+
name: 'ember-lts-3.28-ember-simple-auth-2.0',
351+
npm: {
352+
dependencies: {
353+
'ember-simple-auth': '^2.0.0',
354+
'whatwg-fetch': '3.3.1'
355+
},
356+
devDependencies: {
357+
'ember-source': '~3.28.0'
358+
}
359+
}
360+
},
361+
{
362+
name: 'ember-lts-3.28-ember-simple-auth-3.0',
363+
npm: {
364+
dependencies: {
365+
'ember-simple-auth': '^3.0.0'
366+
},
367+
devDependencies: {
368+
'ember-source': '~3.28.0'
369+
}
370+
}
371+
},
372+
{
373+
name: 'ember-lts-3.28-ember-simple-auth-4.0',
374+
npm: {
375+
dependencies: {
376+
'ember-simple-auth': '^4.0.0'
377+
},
378+
devDependencies: {
379+
'ember-source': '~3.28.0'
380+
}
381+
}
382+
},
337383
{
338384
name: 'ember-release-ember-simple-auth-1.6',
339385
npm: {

0 commit comments

Comments
 (0)