Skip to content
Snippets Groups Projects
Commit 1d00a69c authored by Duijn,S.H.J. (Sivan)'s avatar Duijn,S.H.J. (Sivan)
Browse files

Merge branch 'main' into 'develop'

merge main back into develop to have same ci configs

See merge request !14
parents da660331 64639b43
No related branches found
No related tags found
3 merge requests!17fix(storybook): :ambulance: adds babel config for module resolution of util projects,!15May 2022 merge request,!14merge main back into develop to have same ci configs
......@@ -42,7 +42,7 @@ test:
- yarn nx affected --base=HEAD~1 --target=test --parallel --max-parallel=2
build:
stage: test
stage: build
only:
- main
needs:
......@@ -62,8 +62,7 @@ build-docker:
tags:
- docker
only:
- develop
- debug
- main
script:
- docker build --progress plain -t $CI_PROJECT_NAME-webserver-service:latest .
# after_script:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment