TTMK/web2.0-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into production

Browse Source
This commit is contained in:
Jan Tuomi
2024-05-27 15:32:55 +03:00
parent 8e1b0b9a30 2cf804be05
commit a33dc3e77e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+6 -6
View File
@@ -79,10 +79,10 @@ test:e2e:
publish:dev: publish:dev:
stage: publish stage: publish
image: docker:stable image: docker:25-cli
needs: ["build", "test:e2e", "es:lint", "css:lint"] needs: ["build", "test:e2e", "es:lint", "css:lint"]
services: services:
- docker:stable-dind - docker:25-dind
only: only:
- master - master
script: script:
@@ -92,9 +92,9 @@ publish:dev:
publish:prod: publish:prod:
stage: publish stage: publish
image: docker:stable image: docker:25-cli
services: services:
- docker:stable-dind - docker:25-dind
only: only:
- production - production
script: script:
@@ -104,7 +104,7 @@ publish:prod:
deploy:dev: deploy:dev:
stage: deploy stage: deploy
image: docker:stable image: docker:25-cli
only: only:
- master - master
environment: environment:
@@ -124,7 +124,7 @@ deploy:dev:
deploy:prod: deploy:prod:
stage: deploy stage: deploy
image: docker:stable image: docker:25-cli
only: only:
- production - production
environment: environment: