From 1b970d662ed4ef2f9ecc004f149b17da13fa8a95 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 25 May 2022 10:58:19 -0400
Subject: [PATCH 1/4] GitLab CI: move `lint` jobs into `test` step

---
 .gitlab-ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index faa87ef71..6fdcf8c36 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,6 @@ cache:
 
 stages:
   - install
-  - lint
   - test
   - build
   - deploy
@@ -26,7 +25,7 @@ install-dependencies:
       - node_modules/
 
 lint-js:
-  stage: lint
+  stage: test
   script: yarn lint:js
   only:
     changes:
@@ -38,7 +37,7 @@ lint-js:
       - ".eslintrc.js"
 
 lint-sass:
-  stage: lint
+  stage: test
   script: yarn lint:sass
   only:
     changes:

From b798f486d07c94d670b13ba9655af74398d70803 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 25 May 2022 11:00:28 -0400
Subject: [PATCH 2/4] GitLab CI: install-dependencies --> deps, simplify

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6fdcf8c36..bed1c2b04 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,18 +11,14 @@ cache:
     - node_modules/
 
 stages:
-  - install
+  - deps
   - test
   - build
   - deploy
 
-install-dependencies:
-  stage: install
-  script:
-    - yarn install --ignore-scripts
-  artifacts:
-    paths:
-      - node_modules/
+deps:
+  stage: deps
+  script: yarn install --ignore-scripts
 
 lint-js:
   stage: test

From 91adeca74ad7bd6174538dabe4cea8ff8b0ec005 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 25 May 2022 11:15:41 -0400
Subject: [PATCH 3/4] GitLab CI: move build-production to test step

---
 .gitlab-ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bed1c2b04..9fa27818b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,6 @@ cache:
 stages:
   - deps
   - test
-  - build
   - deploy
 
 deps:
@@ -64,13 +63,13 @@ nginx-test:
       - "installation/mastodon.conf"
 
 build-production:
-  stage: build
+  stage: test
   script: yarn build
   variables:
     NODE_ENV: production
   artifacts:
     paths:
-    - static
+     - static
 
 docs-deploy:
   stage: deploy

From b387c3fed1bc161989b5bc089a0992156b28b92e Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 25 May 2022 11:23:55 -0400
Subject: [PATCH 4/4] GitLab CI: allow failure on review job

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9fa27818b..49bbf1c58 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,6 +102,7 @@ review:
     url: https://$CI_COMMIT_REF_SLUG.git.soapbox.pub
   script:
     - npx -y surge static $CI_COMMIT_REF_SLUG.git.soapbox.pub
+  allow_failure: true
 
 pages:
   stage: deploy