Merge branch 'dev' into 'main'
Dev See merge request illegitimate/illegitimate-bot!158
This commit is contained in:
19
.eslintrc.js
19
.eslintrc.js
@@ -46,14 +46,7 @@ module.exports = {
|
|||||||
"error",
|
"error",
|
||||||
"never"
|
"never"
|
||||||
],
|
],
|
||||||
"no-unused-vars": [
|
"no-unused-vars": "off",
|
||||||
"warn",
|
|
||||||
{
|
|
||||||
"vars": "all",
|
|
||||||
"args": "after-used",
|
|
||||||
"ignoreRestSiblings": false
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"prefer-const": "warn",
|
"prefer-const": "warn",
|
||||||
"no-var": "error",
|
"no-var": "error",
|
||||||
"no-multiple-empty-lines": ["error", { "max": 2, "maxEOF": 1, "maxBOF": 0 }],
|
"no-multiple-empty-lines": ["error", { "max": 2, "maxEOF": 1, "maxBOF": 0 }],
|
||||||
@@ -69,6 +62,14 @@ module.exports = {
|
|||||||
}],
|
}],
|
||||||
"comma-spacing": "error",
|
"comma-spacing": "error",
|
||||||
"@typescript-eslint/no-var-requires": "off",
|
"@typescript-eslint/no-var-requires": "off",
|
||||||
"@typescript-eslint/no-explicit-any": "off"
|
"@typescript-eslint/no-explicit-any": "off",
|
||||||
|
"@typescript-eslint/no-unused-vars": [
|
||||||
|
"warn",
|
||||||
|
{
|
||||||
|
"vars": "all",
|
||||||
|
"args": "after-used",
|
||||||
|
"ignoreRestSiblings": false
|
||||||
|
}
|
||||||
|
],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ docker-build:
|
|||||||
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
|
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
|
||||||
script:
|
script:
|
||||||
- docker build . -f Dockerfile.cache -t node-cache
|
- docker build . -f Dockerfile.cache -t node-cache
|
||||||
- docker build --pull -t "$DOCKER_IMAGE_NAME" .
|
- docker build -t "$DOCKER_IMAGE_NAME" .
|
||||||
- docker push "$DOCKER_IMAGE_NAME"
|
- docker push "$DOCKER_IMAGE_NAME"
|
||||||
- |
|
- |
|
||||||
if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
|
if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user