From a059d134c30bb9c215db4aae4579755fa898047a Mon Sep 17 00:00:00 2001
From: irl <iain@learmonth.me>
Date: Mon, 13 Dec 2021 18:36:16 +0000
Subject: [PATCH] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1abe394..13f84cd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
-build:
+pages: # the job must be named pages
   image: node:latest
-  stage: build
+  stage: deploy
   before_script:
     # - ./update_version.sh
     - echo $CI_COMMIT_TIMESTAMP $CI_COMMIT_SHORT_SHA > src/assets/version.txt
@@ -11,33 +11,17 @@ build:
     - 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
-
-pages: # the job must be named pages
-  image: node:latest
-  stage: deploy
-  script:
-    - echo "Deploy to GitLab pages"
   artifacts:
     paths:
       - public # artifact path must be /public for GitLab Pages to pick it up
   only:
-    - dev
+    - main
 
 s3-deploy:
   stage: .post
   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
-  only:
-  - main
-
-s3-deploy-dev:
-  stage: .post
-  image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest
-  script:
   - aws s3 sync ./public s3://gp-web-prod-shared-weblite-bucket-dev --delete --only-show-errors
   only:
-  - dev
+  - main