Commit 3f47b59d authored by jfriedli's avatar jfriedli
Browse files

Merge branch 'develop' into 'master'

Deps Updates and Renovate Update

See merge request !274
parents 6f959985 583cd85d
Pipeline #39928 passed with stages
in 13 minutes and 3 seconds
......@@ -110,19 +110,13 @@ build_tagged_container:
# Updates the dependencies in this project and creates automated merge requests
renovate:
stage: renovate
image: docker:19.03.8
services:
- docker:19.03.8-dind
variables:
DOCKER_TLS_CERTDIR: "/certs"
RENOVATE_CONFIG_FILE: renovate-config.js
only:
- schedules
before_script:
- echo "updating deps"
RENOVATE_TOKEN: $GITLAB_API_TOKEN
image:
name: renovate/renovate:19
entrypoint: ['']
script:
- docker run -e GITLAB_TOKEN="$GITLAB_TOKEN" -e GITHUB_TOKEN="$GITHUB_TOKEN" -v $PWD/renovate-config.js:/usr/src/app/config.js renovate/renovate:13 $(cat repositories.txt | xargs)
allow_failure: true
- node /usr/src/app/dist/renovate.js --platform gitlab --endpoint ${CI_API_V4_URL} --token ${GITLAB_API_TOKEN} ${CI_PROJECT_PATH}
# Run a sast analysis over the container
......
# production container
FROM nginx:1.17.9-alpine
FROM nginx:1.18.0-alpine
LABEL maintainer="Mat2 Web Frontend Maintainer <jan.friedli@immerda.ch>"
......
// config for renovate! not quasar
module.exports = {
platform: 'gitlab',
endpoint: 'https://0xacab.org/api/v4/',
token: process.env.RENOVATE_TOKEN,
repositories: [
'jfriedli/mat2-quasar-frontend'
],
logLevel: 'info',
requireConfig: true,
onboarding: true,
onboardingConfig: {
extends: ['config:base'],
prConcurrentLimit: 5
},
enabledManagers: [
'yarn'
]
}
// config for renovate! not quasar
module.exports = {
platform: 'gitlab',
endpoint: 'https://0xacab.org/api/v4/',
assignees: ['jfriedli'],
baseBranches: ['develop'],
labels: ['renovate'],
extends: ['config:base']
}
{
"extends": [
"config:base"
],
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"commitMessagePrefix": "RenovateBot: ",
"packageRules": [
{
"updateTypes": ["minor", "patch", "pin", "digest"],
......
jfriedli/mat2-quasar-frontend
......@@ -8,7 +8,7 @@ describe('error page', () => {
cy.get('[data-cy=general-error-text]').contains('O Ooooh, Something went wrong')
cy.get('[data-cy=general-error-report]').contains('If you keep getting this error report it here')
cy.get('[data-cy=error-btn] .q-btn__content > div').contains('Back')
cy.get('[data-cy=error-btn] .q-btn__content > span').contains('Back')
cy.get('[data-cy=error-btn]')
.should('have.attr', 'href').and(
'include',
......
......@@ -7,7 +7,7 @@ describe('404 page', () => {
.should('have.attr', 'src').and('include', 'img/kitty.')
cy.get('[data-cy=four-o-four-text]').contains('There\'s no yarn here. (404)')
cy.get('[data-cy=404-btn] .q-btn__content > div').contains('Back')
cy.get('[data-cy=404-btn] .q-btn__content > span').contains('Back')
cy.get('[data-cy=404-btn]')
.should('have.attr', 'href').and(
'include',
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment