From 9c825dfc16d445ff9132f7799f186a01327d6ec1 Mon Sep 17 00:00:00 2001
From: irl <iain@learmonth.me>
Date: Sat, 22 Jan 2022 11:35:30 +0000
Subject: [PATCH] Give up on GitLab pages to get dev builds working

---
 .gitlab-ci.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 13f84cd..ca9922b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
-pages: # the job must be named pages
+build:
   image: node:latest
-  stage: deploy
+  stage: build
   before_script:
     # - ./update_version.sh
     - echo $CI_COMMIT_TIMESTAMP $CI_COMMIT_SHORT_SHA > src/assets/version.txt
@@ -9,19 +9,19 @@ pages: # the job must be named pages
     - export NODE_OPTIONS=--openssl-legacy-provider
     - npm ci
     - npm run build
-    - mv public public-vue # GitLab Pages hooks on the public folder
-    - mv dist public # rename the dist folder (result of npm run build)
-  artifacts:
-    paths:
-      - public # artifact path must be /public for GitLab Pages to pick it up
-  only:
-    - main
 
-s3-deploy:
-  stage: .post
+s3:
+  stage: deploy
   image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest
   script:
-  - aws s3 sync ./public s3://gp-web-prod-shared-weblite-bucket --delete --only-show-errors
-  - aws s3 sync ./public s3://gp-web-prod-shared-weblite-bucket-dev --delete --only-show-errors
+  - aws s3 sync ./dist s3://gp-web-prod-shared-weblite-bucket --delete --only-show-errors
   only:
   - main
+
+s3-dev:
+  stage: deploy
+  image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest
+  script:
+  - aws s3 sync ./dist s3://gp-web-prod-shared-weblite-bucket-dev --delete --only-show-errors
+  only:
+  - dev