Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
howto-cards
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
5
Issues
5
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
External Wiki
External Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
R3
howto-cards
Commits
83a9c85c
Commit
83a9c85c
authored
Apr 22, 2020
by
Laurent Heirendt
✈
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into 'master'
Regular merge of develop See merge request
!131
parents
42c7acdc
bea21fce
Pipeline
#25687
passed with stage
in 4 minutes and 21 seconds
Changes
2
Pipelines
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
.gitlab-ci.yml
.gitlab-ci.yml
+9
-2
assets/banners/howto-card/motto.svg
assets/banners/howto-card/motto.svg
+1
-1
No files found.
.gitlab-ci.yml
View file @
83a9c85c
...
...
@@ -21,7 +21,7 @@ build_pages:
before_script
:
-
apt-get -qq update
-
apt-get install -y -qq git-lfs
-
gem install bundler:2.0.2 && bundle install
-
gem install bundler:2.0.2 && bundle install
script
:
-
bash .ci/deploy.sh
variables
:
...
...
@@ -71,8 +71,11 @@ build pages for VM deployment:
expire_in
:
1 day
paths
:
-
new_build
rules
:
-
if
:
$CI_COMMIT_BRANCH
-
if
:
$CI_MERGE_REQUEST_ID
before_script
:
-
gem install bundler:$BUNDLER_VERSION && bundle install
-
gem install bundler:$BUNDLER_VERSION && bundle install
script
:
# Generate the configuration for forks (will use Gitlab Pages on personal namespaces)
-
'
echo
"url:
https://$CI_PROJECT_NAMESPACE.$CI_PAGES_DOMAIN"
>>
.ci/_config_gitlab_pages.yml'
...
...
@@ -97,6 +100,9 @@ generate the search index for VM deployment:
script
:
-
bash .ci/build_indices_new.sh
-
mv new_build new_processed_build
rules
:
-
if
:
$CI_COMMIT_BRANCH
-
if
:
$CI_MERGE_REQUEST_ID
artifacts
:
expire_in
:
1 day
paths
:
...
...
@@ -108,6 +114,7 @@ new pages:
stage
:
deploy
rules
:
-
if
:
'
$CI_PROJECT_NAMESPACE
!=
"R3"
&&
$CI_PROJECT_NAMESPACE
!=
"R3-core"'
-
if
:
$CI_MERGE_REQUEST_ID
script
:
-
mv new_processed_build new_public
artifacts
:
...
...
assets/banners/howto-card/motto.svg
View file @
83a9c85c
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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