Make changes

This commit is contained in:
Benjamin 2025-06-13 15:50:40 -04:00
parent 2fae23774a
commit cac14626aa
No known key found for this signature in database
GPG Key ID: E9469FAA8B44BB16
3 changed files with 4 additions and 10 deletions

View File

@ -38,20 +38,14 @@ check:
fi
script:
- start_section "Install Dependencies"
# temporarily replace FontAwesomePro dependency with its fake version as the CI cant 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'
- echo "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com" > ~/.git-credentials
- git config set --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"

View File

@ -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",

2
pnpm-lock.yaml generated
View File

@ -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