Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
schleuder
schleuder-website
Commits
89c397b1
Commit
89c397b1
authored
Mar 19, 2021
by
georg
Browse files
Merge branch 'main-is-main-in-gitlabci' into 'main'
Make gitlab ci use main as main branch. See merge request
!100
parents
0e48de6c
5ffb5430
Pipeline
#55905
passed with stages
in 44 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
89c397b1
...
...
@@ -12,8 +12,8 @@ variables:
build
:
script
:
# Set jekylls 'baseurl' option in case we're not dealing with the ma
ster
branch.
-
'
if
!
[
"$CI_COMMIT_REF_SLUG"
==
"ma
ster
"
];
then
# Set jekylls 'baseurl' option in case we're not dealing with the ma
in
branch.
-
'
if
!
[
"$CI_COMMIT_REF_SLUG"
==
"ma
in
"
];
then
echo
"baseurl:
/$DEPLOY_SLUG"
>>
_config.yml;
fi'
-
jekyll build --verbose
...
...
@@ -41,11 +41,11 @@ deploy:
|1|8YPsezXF2SYQ7rq9U5TbDnMsVjo=|SJOodZB+8j+dO+l6YTdZ7+44XLw= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPJx38PfGvaHtkSsHptiHoIQxlI3Yf0cskPNTwAQnY14
" > ~/.ssh/known_hosts
-
tar fxv site.tar.gz
# In case we're not dealing with the ma
ster
branch, create the review dir on the webserver.
# In case we're not dealing with the ma
in
branch, create the review dir on the webserver.
# We need to catch possible errors, as lftp seems buggy: It fails if the dir already exists,
# even if called with the -f option, which should ignore errors (like this one).
# lftp needs a "dummy" password, even if key-based authentication is used.
-
if ! [ "$CI_COMMIT_REF_SLUG" == "ma
ster
" ];
-
if ! [ "$CI_COMMIT_REF_SLUG" == "ma
in
" ];
then DEPLOY_SLUG="www/$DEPLOY_SLUG";
export DEPLOY_SLUG;
lftp -e "mkdir -fp $DEPLOY_SLUG; quit" -u $DEPLOY_USER,dummy sftp://$DEPLOY_HOST || /bin/true;
...
...
@@ -73,11 +73,11 @@ codespell:
# Also, exclude the vendor dir, which leads to false positives.
-
codespell -q 2 -f -I utils/ci/codespell/ignored_words.txt -S vendor
# This job should help with merge requests. Therefore, don't run it
# against the ma
ster
branch.
# against the ma
in
branch.
only
:
-
branches
except
:
-
ma
ster
-
ma
in
stage
:
qa
linkcheck
:
...
...
@@ -89,9 +89,9 @@ linkcheck:
# This job relies on secret env vars, which are only available in our repo.
-
branches@schleuder/schleuder-website
except
:
# This job should help with merge requests, so there is no point in running it against the ma
ster
# This job should help with merge requests, so there is no point in running it against the ma
in
# branch.
-
ma
ster
@schleuder/schleuder-website
-
ma
in
@schleuder/schleuder-website
stage
:
qa
variables
:
GIT_STRATEGY
:
none
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment