Merge branch 'update-font-awesome' into 'main'

Update CI/CD and FontAwesome Dependencies

See merge request PronounsPage/PronounsPage!630

.gitlab-ci.yml

@@ -37,21 +37,11 @@ check:
                 apt-get install build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev -y
             fi
     script:
-        - start_section "Install Dependencies"
-        # temporarily replace FontAwesomePro dependency with its fake version as the CI can’t access it
-        # the name needs to be changed in both package.json and pnpm-lock.yaml
-        - 'sed -i "s/git+ssh:\/\/git@gitlab.com:Avris\/FontAwesomePro.git/git+https:\/\/gitlab.com\/Avris\/FakeFontAwesomePro.git/" package.json pnpm-lock.yaml'
-        # the referenced SHA needs to be additionally changed in pnpm-lock.yaml
-        - 'sed -i "s/git@gitlab.com+Avris\/FontAwesomePro\/f00db606f659dca78b143b7bcab5671b2cb459a8/gitlab.com\/Avris\/FakeFontAwesomePro\/0d322c775cbe9bf99da261700be30251291b51a8/" pnpm-lock.yaml'
-        - 'sed -i "s/resolution: {commit: f00db606f659dca78b143b7bcab5671b2cb459a8, repo: git@gitlab.com:Avris\/FontAwesomePro.git, type: git}/resolution: { tarball: https:\/\/gitlab.com\/api\/v4\/projects\/Avris%2FFakeFontAwesomePro\/repository\/archive.tar.gz?sha=0d322c775cbe9bf99da261700be30251291b51a8 }/" pnpm-lock.yaml'
+        - start_section "Install Dependencies & Setup Environment"
+        - echo "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com" > ~/.git-credentials
+        - git config --global credential.helper store
         - corepack enable pnpm
-        - pnpm install || record_failure
-        - end_section
-
-        - start_section "Setup environment"
         - make install || record_failure
-        # revert the changes for the FontAwesomePro dependency only now because `make install` calls `pnpm install`
-        - git restore package.json pnpm-lock.yaml
         - end_section
 
         - start_section "Type checking"
@@ -59,8 +49,7 @@ check:
         - end_section
 
         - start_section "Unit Tests"
-        - >
-            pnpm vitest --reporter=default --reporter=junit --outputFile=junit.xml --coverage || record_failure
+        - pnpm vitest --reporter=default --reporter=junit --outputFile=junit.xml --coverage || record_failure
         - end_section
 
         - start_section "Check linting rules"
@@ -214,7 +203,10 @@ deploy test/purple:
         ENVIRONMENT_INSTANCE: 'purple'
         ENVIRONMENT_DOMAIN: 'test-purple.pronouns.page'
 
-# include:
-#     - template: Security/Dependency-Scanning.gitlab-ci.yml
-#
+include:
+    - template: Jobs/Dependency-Scanning.gitlab-ci.yml
+
+variables:
+    AST_ENABLE_MR_PIPELINES: 'true'
+
 # Pending resolution of: https://gitlab.com/PronounsPage/PronounsPage/-/merge_requests/453#note_1911466136

README.md

@@ -15,7 +15,7 @@ We're using FontAwesome Pro, so to set up a local copy without having a FA licen
 open `package.json` and replace
 
 ```
-"@fortawesome/fontawesome-pro": "git+ssh://git@gitlab.com:Avris/FontAwesomePro.git",
+"@fortawesome/fontawesome-pro": "https://gitlab.com/Avris/FontAwesomePro",
 ```
 
 with
@@ -26,7 +26,7 @@ with
 or, for Git via HTTPS:
 
 ```
-"@fortawesome/fontawesome-pro": "git+https://git@gitlab.com/Avris/FakeFontAwesomePro.git",
+"@fortawesome/fontawesome-pro": "https://gitlab.com/Avris/FakeFontAwesomePro",
 ```
 
 Do not commit that change!

package.json

@@ -20,7 +20,7 @@
         "@aws-sdk/client-polly": "^3.525.0",
         "@aws-sdk/client-s3": "^3.525.0",
         "@floating-ui/vue": "^1.1.5",
-        "@fortawesome/fontawesome-pro": "git+ssh://git@gitlab.com:Avris/FontAwesomePro.git",
+        "@fortawesome/fontawesome-pro": "https://gitlab.com/Avris/FontAwesomePro",
         "@sentry/browser": "^7.109.0",
         "@sentry/cli": "^2.31.0",
         "@sentry/node": "^7.109.0",

pnpm-lock.yaml

@@ -21,7 +21,7 @@ importers:
         specifier: ^1.1.5
         version: 1.1.5(vue@3.5.16(typescript@5.8.3))
       '@fortawesome/fontawesome-pro':
-        specifier: git+ssh://git@gitlab.com:Avris/FontAwesomePro.git
+        specifier: https://gitlab.com/Avris/FontAwesomePro
         version: git+https://git@gitlab.com:Avris/FontAwesomePro.git#f00db606f659dca78b143b7bcab5671b2cb459a8
       '@sentry/browser':
         specifier: ^7.109.0