Commit 6775651e authored by James Lopez's avatar James Lopez

Merge branch 'update-ci-template-default-branch-2' into 'master'

Update CI template examples to default branch

See merge request gitlab-org/gitlab!56301
parents 8b902393 2c5a74d0
---
title: Update CI template examples to default branch
merge_request: 56301
author:
type: other
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
# Below is the template to run your tests in Julia # Below is the template to run your tests in Julia
.test_template: &test_definition .test_template: &test_definition
# Uncomment below if you would like to run the tests on specific references # Uncomment below (and adjust as needed) to run the tests for specific references
# only, such as the branches `master`, `development`, etc. # only, such as the default branch, a `development` branch, and so on:
# only: # rules:
# - master # - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
# - development # - if: $CI_COMMIT_BRANCH == "development"
script: script:
# Let's run the tests. Substitute `coverage = false` below, if you do not # Let's run the tests. Substitute `coverage = false` below, if you do not
# want coverage results. # want coverage results.
...@@ -63,8 +63,8 @@ pages: ...@@ -63,8 +63,8 @@ pages:
artifacts: artifacts:
paths: paths:
- public - public
only: rules:
- master - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
# WARNING: This template is using the `julia` images from [Docker # WARNING: This template is using the `julia` images from [Docker
# Hub][3]. One can use custom Julia images and/or the official ones found # Hub][3]. One can use custom Julia images and/or the official ones found
......
...@@ -33,7 +33,8 @@ cache: ...@@ -33,7 +33,8 @@ cache:
script: script:
- 'mvn $MAVEN_CLI_OPTS verify' - 'mvn $MAVEN_CLI_OPTS verify'
except: except:
- master variables:
- $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
# Verify merge requests using JDK8 # Verify merge requests using JDK8
verify:jdk8: verify:jdk8:
...@@ -51,4 +52,5 @@ deploy:jdk8: ...@@ -51,4 +52,5 @@ deploy:jdk8:
fi fi
- 'mvn $MAVEN_CLI_OPTS deploy -s ci_settings.xml' - 'mvn $MAVEN_CLI_OPTS deploy -s ci_settings.xml'
only: only:
- master variables:
- $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
...@@ -24,8 +24,8 @@ before_script: ...@@ -24,8 +24,8 @@ before_script:
release: release:
stage: deploy stage: deploy
only: rules:
- master - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
artifacts: artifacts:
paths: paths:
- build/release/MyProject.exe - build/release/MyProject.exe
......
...@@ -23,6 +23,6 @@ build: ...@@ -23,6 +23,6 @@ build:
environment: production environment: production
script: script:
- find . -maxdepth 1 -name '*.json' -print0 | xargs -t0n1 packer build - find . -maxdepth 1 -name '*.json' -print0 | xargs -t0n1 packer build
when: manual rules:
only: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- master when: manual
...@@ -47,5 +47,5 @@ pages: ...@@ -47,5 +47,5 @@ pages:
artifacts: artifacts:
paths: paths:
- public - public
only: rules:
- master - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
...@@ -21,8 +21,8 @@ archive_project: ...@@ -21,8 +21,8 @@ archive_project:
script: script:
- xcodebuild clean archive -archivePath build/ProjectName -scheme SchemeName - xcodebuild clean archive -archivePath build/ProjectName -scheme SchemeName
- xcodebuild -exportArchive -exportFormat ipa -archivePath "build/ProjectName.xcarchive" -exportPath "build/ProjectName.ipa" -exportProvisioningProfile "ProvisioningProfileName" - xcodebuild -exportArchive -exportFormat ipa -archivePath "build/ProjectName.xcarchive" -exportPath "build/ProjectName.ipa" -exportProvisioningProfile "ProvisioningProfileName"
only: rules:
- master - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
artifacts: artifacts:
paths: paths:
- build/ProjectName.ipa - build/ProjectName.ipa
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment