From 0e884b0b34d256189e0d18a5dd5e4eba68e03b3c Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 18 Sep 2023 18:12:15 -0500
Subject: [PATCH] ci: combine lint-js and lint-scss into one job, lint

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 41f1abf26c..a79fda26be 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,9 +42,9 @@ danger:
       - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
   allow_failure: true
 
-lint-js:
+lint:
   stage: test
-  script: yarn lint:js
+  script: yarn lint
   only:
     changes:
       - "**/*.js"
@@ -53,16 +53,10 @@ lint-js:
       - "**/*.mjs"
       - "**/*.ts"
       - "**/*.tsx"
-      - ".eslintignore"
-      - ".eslintrc.cjs"
-
-lint-sass:
-  stage: test
-  script: yarn lint:sass
-  only:
-    changes:
       - "**/*.scss"
       - "**/*.css"
+      - ".eslintignore"
+      - ".eslintrc.cjs"
       - ".stylelintrc.json"
 
 # jest: