From 0a3a2dc2ec821b26ef0f2f9cd4635f5a2eb31893 Mon Sep 17 00:00:00 2001 From: Rainer Killinger Date: Mon, 15 Feb 2021 14:10:15 +0100 Subject: [PATCH] ci: introduce renovate and clean up gitlab-ci.yml --- .gitlab-ci.yml | 79 +++++++++++++++++++++++++++++++++------------ src/tasks/remind.ts | 2 +- 2 files changed, 60 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc6c9ead..5006dcd9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,8 @@ image: registry.gitlab.com/openstapps/projectmanagement/node +include: + - project: 'renovate-bot/renovate-runner' + file: '/templates/renovate-dind.gitlab-ci.yml' before_script: - npm ci @@ -7,11 +10,12 @@ before_script: stages: - build - test + - maintenance - audit - publish - deploy -build: +npm build: stage: build script: - npm run build @@ -19,25 +23,17 @@ build: paths: - lib -docker build: - image: registry.gitlab.com/openstapps/projectmanagement/builder - stage: test - variables: - DOCKER_DRIVER: overlay2 - services: - - docker:dind +npm test: script: - - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com - - docker build -t registry.gitlab.com/openstapps/projectmanagement/builder -f images/builder/Dockerfile . - - docker build -t registry.gitlab.com/openstapps/projectmanagement/node -f images/node/Dockerfile . - tags: - - docker + - npm run test + stage: test -docker-builder: +docker image builder: image: registry.gitlab.com/openstapps/projectmanagement/builder stage: build only: - - schedules + variables: + - $BUILD_IMAGES == "true" variables: DOCKER_DRIVER: overlay2 services: @@ -49,11 +45,12 @@ docker-builder: tags: - docker -docker-node: +docker image node: image: registry.gitlab.com/openstapps/projectmanagement/builder stage: build only: - - schedules + variables: + - $BUILD_IMAGES == "true" variables: DOCKER_DRIVER: overlay2 services: @@ -65,7 +62,7 @@ docker-node: tags: - docker -npm: +npm audit: allow_failure: true except: - schedules @@ -73,13 +70,55 @@ npm: - npm audit stage: audit -scheduled npm: +scheduled npm audit: only: - schedules script: - npm audit --audit-level=high stage: audit +tidy: + script: + - node lib/cli tidy + stage: maintenance + only: + variables: + - $MAINTENANCE_MODE == "tidy" + tags: + - secrecy + +remind: + script: + - node lib/cli remind + stage: maintenance + only: + variables: + - $MAINTENANCE_MODE == "remind" + tags: + - secrecy + +unlabel: + script: + - node lib/cli tidy + - node lib/cli unlabel + stage: maintenance + only: + variables: + - $MAINTENANCE_MODE == "unlabel" + tags: + - secrecy + +renovate: + image: renovate/renovate:24.49.8-slim@sha256:50f4223ad6f858082140d18aa0b733d1e6084d206a87dc7dac9f11f445b4e52e + stage: maintenance + variables: + RENOVATE_EXTENDS: "gitlab>openstapps/projectmanagement" + only: + variables: + - $RENOVATE == "true" + tags: + - gitlab-org-docker + pages: stage: deploy script: @@ -93,7 +132,7 @@ pages: package: dependencies: - - build + - npm build tags: - secrecy stage: publish diff --git a/src/tasks/remind.ts b/src/tasks/remind.ts index 4d72eae7..d9e3a3cf 100644 --- a/src/tasks/remind.ts +++ b/src/tasks/remind.ts @@ -120,7 +120,7 @@ export async function remind(api: Api): Promise { if (mergeRequest.assignee.username === username) { return false; } - if (mergeRequest.assignee.username.includes('openstapps')) { + if (username.includes('openstapps')) { return false; }