Merge branch 'develop' into beta
This commit is contained in:
commit
7a174d0eef
1 changed files with 7 additions and 6 deletions
|
@ -28,14 +28,14 @@ services:
|
||||||
- postgres:15
|
- postgres:15
|
||||||
- redis
|
- redis
|
||||||
|
|
||||||
before_script:
|
|
||||||
|
testCommit:
|
||||||
|
stage: build
|
||||||
|
before_script:
|
||||||
- apk add --no-cache cargo python3 make g++
|
- apk add --no-cache cargo python3 make g++
|
||||||
- cp .config/ci.yml .config/default.yml
|
- cp .config/ci.yml .config/default.yml
|
||||||
- corepack enable
|
- corepack enable
|
||||||
- corepack prepare pnpm@latest --activate
|
- corepack prepare pnpm@latest --activate
|
||||||
|
|
||||||
testCommit:
|
|
||||||
stage: build
|
|
||||||
script:
|
script:
|
||||||
- pnpm i --frozen-lockfile
|
- pnpm i --frozen-lockfile
|
||||||
- pnpm run build:debug
|
- pnpm run build:debug
|
||||||
|
@ -51,8 +51,9 @@ dockerPush:
|
||||||
image: docker:latest
|
image: docker:latest
|
||||||
services:
|
services:
|
||||||
- docker:dind
|
- docker:dind
|
||||||
|
before_script:
|
||||||
|
- cp .config/ci.yml .config/default.yml
|
||||||
script:
|
script:
|
||||||
- apk add --no-cache nodejs npm cargo python3 make g++
|
|
||||||
- docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .
|
- docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .
|
||||||
- echo $CI_JOB_TOKEN | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
|
- echo $CI_JOB_TOKEN | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
|
||||||
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
|
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
|
||||||
|
|
Loading…
Reference in a new issue