Merge branch 'develop' into beta

This commit is contained in:
ThatOneCalculator 2023-08-01 23:28:41 -07:00
commit 7a174d0eef
No known key found for this signature in database
GPG key ID: 8703CACD01000000

View file

@ -28,14 +28,14 @@ services:
- postgres:15
- redis
testCommit:
stage: build
before_script:
- apk add --no-cache cargo python3 make g++
- cp .config/ci.yml .config/default.yml
- corepack enable
- corepack prepare pnpm@latest --activate
testCommit:
stage: build
script:
- pnpm i --frozen-lockfile
- pnpm run build:debug
@ -51,8 +51,9 @@ dockerPush:
image: docker:latest
services:
- docker:dind
before_script:
- cp .config/ci.yml .config/default.yml
script:
- apk add --no-cache nodejs npm cargo python3 make g++
- docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .
- echo $CI_JOB_TOKEN | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG