Skip to content

Commit

Permalink
Merge branch 'staging' of https://github.com/csvalpha/amber-ui into r…
Browse files Browse the repository at this point in the history
…enovate/ember-moment-10.x

� Conflicts:
�	.eslintrc.js
�	config/environment.js
�	yarn.lock
  • Loading branch information
guidojw committed Mar 16, 2022
2 parents 1cc9fdf + c42e668 commit eb161cd
Show file tree
Hide file tree
Showing 725 changed files with 12,431 additions and 8,765 deletions.
67 changes: 35 additions & 32 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,70 +7,73 @@ module.exports = {
ecmaVersion: 2018,
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true
}
legacyDecorators: true,
},
},
plugins: [
'ember',
'ember-suave'
],
plugins: ['ember'],
extends: [
'eslint:recommended',
'plugin:ember/recommended',
'plugin:ember-suave/recommended'
'plugin:prettier/recommended',
],
env: {
browser: true
browser: true,
},
rules: {
'arrow-parens': 0,
'ember-suave/no-const-outside-module-scope': 0,
camelcase: ['error', { properties: 'always' }],
'ember/avoid-leaking-state-in-ember-objects': 0,
'ember/use-brace-expansion': 0,
'object-curly-spacing': [
'error',
'always'
],
'ember-suave/lines-between-object-properties': 0,
'ember-suave/require-access-in-comments': 0,
'object-curly-spacing': ['error', 'always'],
'ember/no-controller-access-in-routes': 1,
'ember/no-classic-classes': 1,
'ember/no-actions-hash': 1,
'ember/classic-decorator-no-classic-methods': 1,
'ember/require-tagless-components': 1,
'ember/no-classic-components': 1,
'lines-between-class-members': ['error', 'always', { 'exceptAfterSingleLine': true }],
'no-multiple-empty-lines': [2, { 'max': 1, 'maxBOF': 0, 'maxEOF': 0 }],
'padded-blocks': [2, 'never', { 'allowSingleLineBlocks': true }]
'lines-between-class-members': [
'error',
'always',
{ exceptAfterSingleLine: true },
],
'no-multiple-empty-lines': [2, { max: 1, maxBOF: 0, maxEOF: 0 }],
'padded-blocks': [2, 'never', { allowSingleLineBlocks: true }],
},
overrides: [
// node files
{
files: [
'.eslintrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'lib/*/index.js',
'server/**/*.js'
'./.eslintrc.js',
'./.prettierrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./testem.js',
'./blueprints/*/index.js',
'./config/**/*.js',
'./lib/*/index.js',
'./server/**/*.js',
'./.stylelintrc.js',
'./.stylelintrc.order.js',
],
parserOptions: {
sourceType: 'script',
ecmaVersion: 2018
},
env: {
browser: false,
node: true
node: true,
},
plugins: ['node'],
extends: ['plugin:node/recommended'],
rules: {
// this can be removed once the following is fixed
// https://github.com/mysticatea/eslint-plugin-node/issues/77
'node/no-unpublished-require': 'off'
}
}
]
'node/no-unpublished-require': 'off',
},
},
{
// Test files:
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
},
],
};
5 changes: 4 additions & 1 deletion .github/issue_template.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
### How to reproduce

1. ...

### Expected behaviour

Explain what should happen

### Current behaviour

Explain what currently happens

*Optionally add some screenshots*
_Optionally add some screenshots_
22 changes: 22 additions & 0 deletions .github/problem-matchers/ember-template-lint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"problemMatcher": [
{
"owner": "ember-template-lint",
"pattern": [
{
"regexp": "^([^\\s].*)$",
"file": 1
},
{
"regexp": "^\\s+(\\d+):(\\d+)\\s+(error|warning|info)\\s+(.*)\\s\\s+(.*)$",
"line": 1,
"column": 2,
"severity": 3,
"message": 4,
"code": 5,
"loop": true
}
]
}
]
}
2 changes: 2 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
### Summary

Shortly summarize the changes in this pull request. Does it concern changes in the UI, add some screenshots. Are there related issues solved? Please, mention them (with 'fixes #xyz', see https://github.com/blog/1506-closing-issues-via-pull-requests), so they can be resolved automatically when merging this pull request.

### Other information

If there is some other relavent and imporant information for this pull request, mention it here. For example, related pull requests (also in `amber-api`) or newly introduced conventions, packages or other dependencies.
9 changes: 8 additions & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{
"extends": ["config:base", ":disableDependencyDashboard", ":semanticCommits", ":semanticCommitTypeAll(chore)", "helpers:pinGitHubActionDigests", "docker:enableMajor"],
"extends": [
"config:base",
":disableDependencyDashboard",
":semanticCommits",
":semanticCommitTypeAll(chore)",
"helpers:pinGitHubActionDigests",
"docker:enableMajor"
],
"labels": ["dependencies"],
"prConcurrentLimit": 0,
"rangeStrategy": "bump",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cleanup-registry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Delete old versions
uses: snok/container-retention-policy@81ba73785bb8207a451a0de928aa6a3c57d6fd77 # renovate: tag=v1.4.0
uses: snok/container-retention-policy@81ba73785bb8207a451a0de928aa6a3c57d6fd77 # tag=v1.4.0
with:
image-names: ${{ env.IMAGE_NAMES }}
cut-off: 2 days ago UTC
Expand Down
29 changes: 19 additions & 10 deletions .github/workflows/continuous-delivery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
stage: ${{ steps.get_metadata.outputs.stage }}
steps:
- name: Checkout code
uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2.4.0
uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # tag=v3.0.0

- name: Get metadata
id: get_metadata
Expand Down Expand Up @@ -82,11 +82,11 @@ jobs:
- name: Checkout code
if: fromJSON(needs.metadata.outputs.has_diff)
uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2.4.0
uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # tag=v3.0.0

- name: Run merge
if: fromJSON(needs.metadata.outputs.has_diff)
uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # renovate: tag=v1.4.0
uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # tag=v1.4.0
with:
type: now
from_branch: staging
Expand Down Expand Up @@ -137,20 +137,20 @@ jobs:
fi
- name: Checkout code
uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2.4.0
uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # tag=v3.0.0
with:
ref: ${{ needs.merge.outputs.sha }}

- name: Start deployment
uses: bobheadxi/deployments@f235d02c2daaaa84c710d013c7d39f7f0f8bf298 # renovate: tag=v0.6.2
uses: bobheadxi/deployments@b0db96170b843c3c786ed42a046d869c50efe3cd # tag=v1.1.0
id: start_deployment
with:
step: start
token: ${{ secrets.GITHUB_TOKEN }}
env: ${{ needs.metadata.outputs.stage }}

- name: Deploy
uses: appleboy/ssh-action@1d1b21ca96111b1eb4c03c21c14ebb971d2200f6 # renovate: tag=v0.1.4
uses: appleboy/ssh-action@1d1b21ca96111b1eb4c03c21c14ebb971d2200f6 # tag=v0.1.4
env:
STAGE: ${{ needs.metadata.outputs.stage }}
with:
Expand All @@ -164,7 +164,7 @@ jobs:
docker-compose up -d
- name: Finalize Sentry release
uses: getsentry/action-release@744e4b262278339b79fb39c8922efcae71e98e39 # renovate: tag=v1.1.6
uses: getsentry/action-release@744e4b262278339b79fb39c8922efcae71e98e39 # tag=v1.1.6
env:
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
SENTRY_PROJECT: ${{ env.PROJECT_NAME }}
Expand All @@ -174,19 +174,28 @@ jobs:
set_commits: skip

- name: Finish deployment
uses: bobheadxi/deployments@f235d02c2daaaa84c710d013c7d39f7f0f8bf298 # renovate: tag=v0.6.2
uses: bobheadxi/deployments@b0db96170b843c3c786ed42a046d869c50efe3cd # tag=v1.1.0
if: steps.start_deployment.conclusion == 'success' && always()
with:
step: finish
token: ${{ secrets.GITHUB_TOKEN }}
status: ${{ job.status }}
deployment_id: ${{ steps.start_deployment.outputs.deployment_id }}
env: ${{ needs.metadata.outputs.stage }}
env_url: ${{ steps.get_url.outputs.environment_url }}

update_check_run:
name: Update Check Run
runs-on: ubuntu-latest
needs: [branch_check, metadata, merge, continuous_integration, publish_image, deploy]
needs:
[
branch_check,
metadata,
merge,
continuous_integration,
publish_image,
deploy,
]
if: (github.ref_name == 'staging' || github.ref_name == 'master') && always()
steps:
- name: Get conclusion
Expand All @@ -203,7 +212,7 @@ jobs:
done
- name: Update Continuous Delivery check run
uses: guidojw/actions/update-check-run@2b1dea8cbd9e44491c269e771b75636026caf8ca # renovate: tag=v1.1.0
uses: guidojw/actions/update-check-run@2b1dea8cbd9e44491c269e771b75636026caf8ca # tag=v1.1.0
with:
app_id: ${{ env.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }}
Expand Down
20 changes: 11 additions & 9 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2.4.0
uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # tag=v3.0.0
with:
ref: ${{ inputs.sha }}

- name: Build test image
uses: guidojw/actions/build-docker-image@2b1dea8cbd9e44491c269e771b75636026caf8ca # renovate: tag=v1.1.0
uses: guidojw/actions/build-docker-image@2b1dea8cbd9e44491c269e771b75636026caf8ca # tag=v1.1.0
with:
file: Dockerfile
target: base
Expand All @@ -33,31 +33,33 @@ jobs:
needs: build
steps:
- name: Checkout code
uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2.4.0
uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # tag=v3.0.0
with:
ref: ${{ inputs.sha }}

- name: Add problem matchers
run: |
echo '::add-matcher::.github/problem-matchers/ember-template-lint.json'
echo '::add-matcher::.github/problem-matchers/eslint-stylish.json'
echo '::add-matcher::.github/problem-matchers/stylelint.json'
- name: Set up Node.js
uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561 # renovate: tag=v2.5.1
uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a # tag=v3.0.0
with:
node-version: '14'

- name: Load test image
uses: guidojw/actions/load-docker-image@2b1dea8cbd9e44491c269e771b75636026caf8ca # renovate: tag=v1.1.0
uses: guidojw/actions/load-docker-image@2b1dea8cbd9e44491c269e771b75636026caf8ca # tag=v1.1.0
with:
name: app

- name: Lint
# Convert output of stylelint so that the problem matcher can match it correctly.
run: |
EXIT_STATUS=0
docker run app yarn ci:eslint || EXIT_STATUS=$?
STYLELINT_OUTPUT="$(docker run app yarn ci:stylelint)" || EXIT_STATUS=$?
docker run app yarn lint:hbs || EXIT_STATUS=$?
docker run app yarn lint:js || EXIT_STATUS=$?
STYLELINT_OUTPUT="$(docker run app yarn lint:scss)" || EXIT_STATUS=$?
node bin/convert-stylelint-output.js "$STYLELINT_OUTPUT"
exit $EXIT_STATUS
Expand All @@ -67,10 +69,10 @@ jobs:
needs: build
steps:
- name: Load test image
uses: guidojw/actions/load-docker-image@2b1dea8cbd9e44491c269e771b75636026caf8ca # renovate: tag=v1.1.0
uses: guidojw/actions/load-docker-image@2b1dea8cbd9e44491c269e771b75636026caf8ca # tag=v1.1.0
with:
name: app

- name: Test
run: |
docker run -e CI=true -t app yarn test
docker run -e CI=true -t app yarn test:ember
12 changes: 6 additions & 6 deletions .github/workflows/publish-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,24 +53,24 @@ jobs:
needs: metadata
steps:
- name: Checkout code
uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2.4.0
uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # tag=v3.0.0
with:
ref: ${{ inputs.sha }}
fetch-depth: 0

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@94ab11c41e45d028884a99163086648e898eed25 # renovate: tag=v1.6.0
uses: docker/setup-buildx-action@94ab11c41e45d028884a99163086648e898eed25 # tag=v1.6.0

- name: Login to GitHub Container Registry
uses: docker/login-action@42d299face0c5c43a0487c477f595ac9cf22f1a7 # renovate: tag=v1.12.0
uses: docker/login-action@dd4fa0671be5250ee6f50aedf4cb05514abda2c7 # tag=v1.14.1
with:
registry: ${{ env.REGISTRY_URL }}
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push image
id: build_push_image
uses: docker/build-push-action@7f9d37fa544684fb73bfe4835ed7214c255ce02b # renovate: tag=v2.9.0
uses: docker/build-push-action@7f9d37fa544684fb73bfe4835ed7214c255ce02b # tag=v2.9.0
with:
push: true
context: .
Expand All @@ -90,7 +90,7 @@ jobs:
- name: Create Sentry release
if: ${{ !(github.event_name == 'workflow_dispatch' && github.workflow == 'Publish Image') }}
uses: getsentry/action-release@744e4b262278339b79fb39c8922efcae71e98e39 # renovate: tag=v1.1.6
uses: getsentry/action-release@744e4b262278339b79fb39c8922efcae71e98e39 # tag=v1.1.6
env:
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
SENTRY_PROJECT: ${{ env.PROJECT_NAME }}
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
done
- name: Update Publish Image check run
uses: guidojw/actions/update-check-run@2b1dea8cbd9e44491c269e771b75636026caf8ca # renovate: tag=v1.1.0
uses: guidojw/actions/update-check-run@2b1dea8cbd9e44491c269e771b75636026caf8ca # tag=v1.1.0
with:
app_id: ${{ env.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }}
Expand Down
Loading

0 comments on commit eb161cd

Please sign in to comment.