diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c35b523..098c2fc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,10 @@ image: node:18-bullseye-slim +include: + - /apps/leafcutter/.gitlab-ci.yml + stages: + - helm-release - build - docker-build - docker-release @@ -9,36 +13,3 @@ cache: key: ${CI_COMMIT_REF_SLUG} paths: - .turbo/ - -build: - stage: build - script: - - turbo build - -docker-build: - image: registry.gitlab.com/guardianproject-ops/docker-alpine-git:latest - services: - - docker:dind - stage: docker-build - variables: - DOCKER_NS: ${CI_REGISTRY_IMAGE} - DOCKER_TAG: ${CI_COMMIT_SHORT_SHA} - script: - - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - - make docker/build-fresh-push - -docker-release: - image: registry.gitlab.com/guardianproject-ops/docker-alpine-git:latest - services: - - docker:dind - stage: docker-release - variables: - DOCKER_NS: ${CI_REGISTRY_IMAGE} - DOCKER_TAG: ${CI_COMMIT_SHORT_SHA} - DOCKER_TAG_NEW: ${CI_COMMIT_REF_NAME} - only: - - main - - develop - script: - - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - - make docker/add-tag diff --git a/apps/leafcutter/.gitlab-ci.yml b/apps/leafcutter/.gitlab-ci.yml index fc13f52..7f25b3e 100644 --- a/apps/leafcutter/.gitlab-ci.yml +++ b/apps/leafcutter/.gitlab-ci.yml @@ -1,34 +1,10 @@ -image: node:16-bullseye-slim - -stages: - - helm-release - - build - # - test - - docker-build - - docker-release - -cache: - key: ${CI_COMMIT_REF_SLUG} - paths: - - node_modules/ - - .next/cache/ - -build: +leafcutter-build: stage: build script: - npm install - npm run-script build -# chromatic: -# stage: test -# script: -# - npm install -# - npm run-script chromatic --project-token=${CHROMATIC_PROJECT_TOKEN} -# only: -# - main -# - develop - -docker-build: +leafcutter-docker-build: image: registry.gitlab.com/guardianproject-ops/docker-alpine-git:latest services: - docker:dind @@ -40,7 +16,7 @@ docker-build: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - make docker/build-fresh-push -docker-release: +leafcutter-docker-release: image: registry.gitlab.com/guardianproject-ops/docker-alpine-git:latest services: - docker:dind @@ -56,7 +32,7 @@ docker-release: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - make docker/add-tag -helm-release: +leafcutter-helm-release: image: debian:bullseye-slim stage: helm-release only: