Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
howto-cards LEGACY VERSION
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
R3
howto-cards LEGACY VERSION
Commits
0dc07ad2
Verified
Commit
0dc07ad2
authored
4 years ago
by
Laurent Heirendt
Browse files
Options
Downloads
Patches
Plain Diff
add explicit condition for MRs
parent
b004062b
No related branches found
No related tags found
2 merge requests
!131
Regular merge of develop
,
!130
new motto
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
.gitlab-ci.yml
+9
-2
9 additions, 2 deletions
.gitlab-ci.yml
with
9 additions
and
2 deletions
.gitlab-ci.yml
+
9
−
2
View file @
0dc07ad2
...
...
@@ -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
:
...
...
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