Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TIDO
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
subugoe
emo
TIDO
Commits
9b3e4104
Commit
9b3e4104
authored
3 years ago
by
Michelle Weidling
Browse files
Options
Downloads
Plain Diff
Merge branch 'feature/
#203
-ci-remove-entry-point-at-merge' into 'develop'
Feature/
#203
ci remove entry point at merge Closes
#203
See merge request subugoe/emo/Qviewer!135
parents
bc33c2b2
45ad0096
No related branches found
No related tags found
1 merge request
!135
Feature/#203 ci remove entry point at merge
Pipeline
#190356
passed
3 years ago
Stage: clean
Stage: build
Stage: deploy
Stage: preserve-pages
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.ci-scripts/build.sh
+9
-0
9 additions, 0 deletions
.ci-scripts/build.sh
.ci-scripts/remove_entrypoint.sh
+16
-0
16 additions, 0 deletions
.ci-scripts/remove_entrypoint.sh
.gitlab-ci.yml
+24
-22
24 additions, 22 deletions
.gitlab-ci.yml
with
49 additions
and
22 deletions
.ci-scripts/build.sh
0 → 100644
+
9
−
0
View file @
9b3e4104
#!/bin/bash
# This script has originally been a template at .gitlab-ci.yml.
# In order to use it within a Bash conditional we moved it to this script file.
bash .ci-scripts/set_entrypoint_ci.sh
npm
install
npm run build
npm run tweak:build
\ No newline at end of file
This diff is collapsed.
Click to expand it.
.ci-scripts/remove_entrypoint.sh
0 → 100644
+
16
−
0
View file @
9b3e4104
#!/bin/bash
FILE
=
"src/index.template.html"
if
grep
-q
'"entrypoint": ""'
"
$FILE
"
;
then
echo
"No entry point update required."
echo
"CONTINUE_BUILD=true"
>>
build.env
else
echo
"Entry point has to be removed."
mkdir
-p
/tmp/this
&&
cd
/tmp/this
||
exit
git clone git@gitlab.gwdg.de:subugoe/emo/QViewer.git
cd
QViewer
||
exit
sed
-i
's/"entrypoint": ".*"/"entrypoint": ""/'
src/index.template.html
git add src/index.template.html
&&
git commit
-m
"ci: remove entry point"
&&
git push
echo
"CONTINUE_BUILD=false"
>>
build.env
fi
\ No newline at end of file
This diff is collapsed.
Click to expand it.
.gitlab-ci.yml
+
24
−
22
View file @
9b3e4104
...
...
@@ -3,16 +3,33 @@ cache:
-
node_modules/
stages
:
-
clean
-
build
-
deploy
-
preserve-pages
# Templates
.build
:
&build
-
bash .ci-scripts/set_entrypoint_ci.sh
-
npm install
-
npm run build
-
npm run tweak:build
.git
:
&git
-
eval $(ssh-agent -s)
-
echo "$DEPLOY_KEY" | tr -d '\r' | ssh-add - > /dev/null
-
mkdir -p ~/.ssh
-
chmod 700 ~/.ssh
-
ssh-keyscan gitlab.gwdg.de >> ~/.ssh/known_hosts
-
git config --global user.email "tido@gitlab.gwdg.de"
-
git config --global user.name "Gitlab CI"
clean_up
:
image
:
docker.gitlab.gwdg.de/mrodzis/docker-images/debian
stage
:
clean
only
:
-
main
-
develop
script
:
-
*git
-
bash .ci-scripts/remove_entrypoint.sh
artifacts
:
reports
:
dotenv
:
build.env
build_test
:
image
:
docker.gitlab.gwdg.de/subugoe/emo/qviewer/node:latest
...
...
@@ -21,7 +38,7 @@ build_test:
-
develop
stage
:
build
script
:
-
*
build
-
bash .ci-scripts/
build
.sh
artifacts
:
paths
:
-
dist/
...
...
@@ -33,7 +50,7 @@ build_main_and_develop:
-
develop
stage
:
build
script
:
-
*build
-
if [[ $CONTINUE_BUILD == "true" ]]; then bash .ci-scripts/build.sh; fi
artifacts
:
paths
:
-
dist/
...
...
@@ -83,21 +100,6 @@ pushback:
paths
:
-
updated-artifact.zip
.production
:
image
:
node:latest
only
:
-
main
stage
:
deploy
script
:
-
npm install
-
npm run build
-
npm run tweak:build
-
mkdir tido && mv dist/* tido/
artifacts
:
expire_in
:
5 yrs
paths
:
-
tido
# when a git flow release is made, a tag will be pushed starting this job. it
# will keep the resulting artifact from the job declared in `JOB_NUMBER_TO_PRESERVE`
# and it will set up a Gitlab release at the repo. therefore the merge message starting
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment