Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
Canvas
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
Show more breadcrumbs
sc07
Canvas
Commits
e8a67425
Commit
e8a67425
authored
2 months ago
by
Grant
Browse files
Options
Downloads
Plain Diff
Merge branch '151-doc-wiki' into 'main'
Documentation wiki Closes
#151
See merge request
!54
parents
07e5f9a8
7e9b372c
No related branches found
No related tags found
1 merge request
!54
Documentation wiki
Pipeline
#155
failed
2 months ago
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+20
-41
20 additions, 41 deletions
.gitlab-ci.yml
.gitlab/ci/deploy.yml
+32
-0
32 additions, 0 deletions
.gitlab/ci/deploy.yml
.gitlab/ci/wiki.yml
+16
-0
16 additions, 0 deletions
.gitlab/ci/wiki.yml
doc/home.md
+3
-0
3 additions, 0 deletions
doc/home.md
with
71 additions
and
41 deletions
.gitlab-ci.yml
+
20
−
41
View file @
e8a67425
stages
:
-
publish
-
deploy
include
:
-
local
:
"
.gitlab/ci/wiki.yml"
rules
:
-
if
:
'
$CI_PIPELINE_SOURCE
==
"push"
&&
$CI_COMMIT_REF_NAME
==
$CI_DEFAULT_BRANCH'
-
changes
:
-
doc/**/*
-
local
:
"
.gitlab/ci/deploy.yml"
rules
:
-
if
:
'
$CI_PIPELINE_SOURCE
==
"push"
&&
$CI_COMMIT_REF_NAME
==
$CI_DEFAULT_BRANCH'
-
changes
:
# exclude documentation changes from deploy
-
"
doc/**/*"
-
"
.gitlab/*"
when
:
never
variables
:
REGISTRY
:
registry.sc07.dev
IMAGE_NAME
:
sc07/canvas:edge
publish
:
stage
:
publish
tags
:
-
red
rules
:
-
if
:
$CI_COMMIT_BRANCH == "main"
-
changes
:
-
"
.gitlab/*"
when
:
never
-
changes
:
-
"
**/*.md"
when
:
manual
interruptible
:
true
before_script
:
-
echo $PAT | docker login $REGISTRY -u $GITLAB_USER_LOGIN --password-stdin
script
:
-
docker build . --tag $REGISTRY/$IMAGE_NAME
-
docker push $REGISTRY/$IMAGE_NAME
deploy
:
stage
:
deploy
tags
:
-
red
rules
:
-
if
:
$CI_COMMIT_BRANCH == "main"
-
changes
:
-
"
.gitlab/*"
when
:
never
-
changes
:
-
"
**/*.md"
when
:
manual
# dummy job, gitlab gets mad when no jobs exist (when the above are never imported)
dummy
:
stage
:
build
interruptible
:
true
script
:
-
cd $WORK_DIR
-
docker compose pull
-
docker compose up -d
-
echo "dummy"
# rules:
#
-
when: never
This diff is collapsed.
Click to expand it.
.gitlab/ci/deploy.yml
0 → 100644
+
32
−
0
View file @
e8a67425
variables
:
REGISTRY
:
registry.sc07.dev
IMAGE_NAME
:
sc07/canvas:edge
publish
:
stage
:
publish
tags
:
-
red
rules
:
-
changes
:
-
"
**/*.md"
when
:
manual
interruptible
:
true
before_script
:
-
echo $PAT | docker login $REGISTRY -u $GITLAB_USER_LOGIN --password-stdin
script
:
-
docker build . --tag $REGISTRY/$IMAGE_NAME
-
docker push $REGISTRY/$IMAGE_NAME
deploy
:
stage
:
deploy
tags
:
-
red
rules
:
-
changes
:
-
"
**/*.md"
when
:
manual
interruptible
:
true
script
:
-
cd $WORK_DIR
-
docker compose pull
-
docker compose up -d
This diff is collapsed.
Click to expand it.
.gitlab/ci/wiki.yml
0 → 100644
+
16
−
0
View file @
e8a67425
# sync /doc/ to internal wiki repo for UI access
# see #151
build-wiki
:
image
:
alpine
stage
:
build
before_script
:
-
apk add --no-cache git git-subtree
script
:
-
git config user.email "ci@sc07.company"
-
git config user.name "ci"
-
git remote remove gitlab-wiki ||
true
-
git remote add gitlab-wiki "https://ci:$CI_TOKEN@sc07.dev/sc07/canvas.wiki.git"
-
git status
-
git checkout main
-
git pull
-
git push gitlab-wiki `git subtree split -P doc main`:main --force
This diff is collapsed.
Click to expand it.
doc/home.md
0 → 100644
+
3
−
0
View file @
e8a67425
# Canvas
Documentation example
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