From 7cb5fa3b2ae39367705da3f733dbee5537ce6e66 Mon Sep 17 00:00:00 2001
From: Jakob Yanagibashi <jakob@yanagibashi.invalid>
Date: Thu, 20 Jul 2023 11:25:59 +0200
Subject: [PATCH] CI changes after branch removal
---
.gitlab-ci.yml | 40 +++-------------------------------------
1 file changed, 3 insertions(+), 37 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 04c3908..abfd361 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,13 @@
image: alpine:edge
before_script:
- - apk --update --no-cache add npm brotli git
+ - apk --update --no-cache add npm git
- export COMMIT_TIME=$(git show -s --format=%ct $CI_COMMIT_SHA)
- npm ci
production:
script:
- # Switch to main branch
- - git fetch origin main
- - git checkout main
+ - git fetch origin dev
+ - git checkout dev
- git pull
# Build for production
@@ -34,37 +33,4 @@ production:
- git add .
- git commit -m "New version from ${COMMIT_TIME}"
- git push origin main
- environment:
- name: production
- url: https://tailorbird3d.rwth-aachen.de/
- only:
- - main
when: manual
-
-pages:
- script:
- # Switch to dev branch
- - git fetch origin dev
- - git checkout dev
- - git pull
-
- # Check for favicon updates
- - npm install -g cli-real-favicon
- - real-favicon check-for-update --fail-on-update faviconData.json
-
- # Build for GitLab Pages
- - npm run build-gitlab
- - cp -a dist/. public/
-
- # Compression for GitLab Pages
- - find public -type f -regex '.*\.\(htm\|html\|txt\|text\|js\|css\)$' -exec gzip -f -k {} \;
- - find public -type f -regex '.*\.\(htm\|html\|txt\|text\|js\|css\)$' -exec brotli -f -k {} \;
- artifacts:
- paths:
- - public
- expire_in: "500"
- environment:
- name: testing
- url: https://kg.pages.git-ce.rwth-aachen.de/tailorbird
- only:
- - dev
--
GitLab