Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
761a403d
Commit
761a403d
authored
7 years ago
by
Alessio Caiazza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade vendored templates
parent
3a8cf276
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
107 additions
and
20 deletions
+107
-20
vendor/gitignore/Composer.gitignore
vendor/gitignore/Composer.gitignore
+1
-1
vendor/gitignore/Global/Windows.gitignore
vendor/gitignore/Global/Windows.gitignore
+1
-1
vendor/gitignore/Terraform.gitignore
vendor/gitignore/Terraform.gitignore
+7
-8
vendor/gitignore/VisualStudio.gitignore
vendor/gitignore/VisualStudio.gitignore
+3
-3
vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
+3
-1
vendor/gitlab-ci-yml/OpenShift.gitlab-ci.yml
vendor/gitlab-ci-yml/OpenShift.gitlab-ci.yml
+3
-3
vendor/gitlab-ci-yml/Rust.gitlab-ci.yml
vendor/gitlab-ci-yml/Rust.gitlab-ci.yml
+3
-3
vendor/gitlab-ci-yml/dotNET.gitlab-ci.yml
vendor/gitlab-ci-yml/dotNET.gitlab-ci.yml
+86
-0
No files found.
vendor/gitignore/Composer.gitignore
View file @
761a403d
composer.phar
/vendor/
# Commit your application's lock file http
://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
# Commit your application's lock file http
s://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
# composer.lock
This diff is collapsed.
Click to expand it.
vendor/gitignore/Global/Windows.gitignore
View file @
761a403d
...
...
@@ -7,7 +7,7 @@ ehthumbs_vista.db
*.stackdump
# Folder config file
D
esktop.ini
[Dd]
esktop.ini
# Recycle Bin used on file shares
$RECYCLE.BIN/
...
...
This diff is collapsed.
Click to expand it.
vendor/gitignore/Terraform.gitignore
View file @
761a403d
# Compiled files
*.tfstate
*.tfstate.*.backup
*.tfstate.backup
# Local .terraform directories
**/.terraform/*
# Module directory
.terraform/
# .tfstate files
*.tfstate
*.tfstate.*
#
Variable values for development
terraform
.tfvars
#
.tfvars files
*
.tfvars
This diff is collapsed.
Click to expand it.
vendor/gitignore/VisualStudio.gitignore
View file @
761a403d
...
...
@@ -171,11 +171,11 @@ PublishScripts/
# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/
p
ackages/*
**/
[Pp]
ackages/*
# except build/, which is used as an MSBuild target.
!**/
p
ackages/build/
!**/
[Pp]
ackages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/
p
ackages/repositories.config
#!**/
[Pp]
ackages/repositories.config
# NuGet v3's project.json files produces more ignorable files
*.nuget.props
*.nuget.targets
...
...
This diff is collapsed.
Click to expand it.
vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
View file @
761a403d
...
...
@@ -335,7 +335,9 @@ production:
function check_kube_domain() {
if [ -z ${AUTO_DEVOPS_DOMAIN+x} ]; then
echo "In order to deploy, AUTO_DEVOPS_DOMAIN must be set as a variable at the group or project level, or manually added in .gitlab-cy.yml"
echo "In order to deploy or use Review Apps, AUTO_DEVOPS_DOMAIN variable must be set"
echo "You can do it in Auto DevOps project settings or defining a secret variable at group or project level"
echo "You can also manually add it in .gitlab-ci.yml"
false
else
true
...
...
This diff is collapsed.
Click to expand it.
vendor/gitlab-ci-yml/OpenShift.gitlab-ci.yml
View file @
761a403d
...
...
@@ -31,14 +31,14 @@ test2:
-
oc project "$CI_PROJECT_NAME-$CI_PROJECT_ID" 2> /dev/null || oc new-project "$CI_PROJECT_NAME-$CI_PROJECT_ID"
script
:
-
"
oc
get
services
$APP
2>
/dev/null
||
oc
new-app
.
--name=$APP
--strategy=docker"
-
"
oc
start-build
$APP
--from-dir=.
--follow
||
sleep
3s
||
oc
start-build
$APP
--from-dir=.
--follow"
-
"
oc
start-build
$APP
--from-dir=.
--follow
||
sleep
3s
&&
oc
start-build
$APP
--from-dir=.
--follow"
-
"
oc
get
routes
$APP
2>
/dev/null
||
oc
expose
service
$APP
--hostname=$APP_HOST"
review
:
<<
:
*deploy
stage
:
review
variables
:
APP
:
$CI_COMMIT_REF_NAME
APP
:
review-
$CI_COMMIT_REF_NAME
APP_HOST
:
$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$OPENSHIFT_DOMAIN
environment
:
name
:
review/$CI_COMMIT_REF_NAME
...
...
@@ -56,7 +56,7 @@ stop-review:
-
oc delete all -l "app=$APP"
when
:
manual
variables
:
APP
:
$CI_COMMIT_REF_NAME
APP
:
review-
$CI_COMMIT_REF_NAME
GIT_STRATEGY
:
none
environment
:
name
:
review/$CI_COMMIT_REF_NAME
...
...
This diff is collapsed.
Click to expand it.
vendor/gitlab-ci-yml/Rust.gitlab-ci.yml
View file @
761a403d
#
Uno
fficial language image. Look for the different tagged releases at:
# https://hub.docker.com/r/
scorpil
/rust/tags/
image
:
"
scorpil/rust:stable
"
#
O
fficial language image. Look for the different tagged releases at:
# https://hub.docker.com/r/
library
/rust/tags/
image
:
"
rust:latest
"
# Optional: Pick zero or more services to be used on all builds.
# Only needed when using a docker container to run your tests in.
...
...
This diff is collapsed.
Click to expand it.
vendor/gitlab-ci-yml/dotNET.gitlab-ci.yml
0 → 100644
View file @
761a403d
# The following script will work for any project that can be built from command line by msbuild
# It uses powershell shell executor, so you need to add the following line to your config.toml file
# (located in gitlab-runner.exe directory):
# shell = "powershell"
#
# The script is composed of 3 stages: build, test and deploy.
#
# The build stage restores NuGet packages and uses msbuild to build the exe and msi
# One major issue you'll find is that you can't build msi projects from command line
# if you use vdproj. There are workarounds building msi via devenv, but they rarely work
# The best solution is migrating your vdproj projects to WiX, as it can be build directly
# by msbuild.
#
# The test stage runs nunit from command line against Test project inside your solution
# It also saves the resulting TestResult.xml file
#
# The deploy stage copies the exe and msi from build stage to a network drive
# You need to have the network drive mapped as Local System user for gitlab-runner service to see it
# The best way to persist the mapping is via a scheduled task (see: https://stackoverflow.com/a/7867064/1288473),
# running the following batch command: net use P: \\x.x.x.x\Projects /u:your_user your_pass /persistent:yes
# place project specific paths in variables to make the rest of the script more generic
variables
:
EXE_RELEASE_FOLDER
:
'
YourApp\bin\Release'
MSI_RELEASE_FOLDER
:
'
Setup\bin\Release'
TEST_FOLDER
:
'
Tests\bin\Release'
DEPLOY_FOLDER
:
'
P:\Projects\YourApp\Builds'
NUGET_PATH
:
'
C:\NuGet\nuget.exe'
MSBUILD_PATH
:
'
C:\Program
Files
(x86)\MSBuild\14.0\Bin\msbuild.exe'
NUNIT_PATH
:
'
C:\Program
Files
(x86)\NUnit.org\nunit-console\nunit3-console.exe'
stages
:
-
build
-
test
-
deploy
build_job
:
stage
:
build
only
:
-
tags
# the build process will only be started by git tag commits
script
:
-
'
&
"$env:NUGET_PATH"
restore'
# restore Nuget dependencies
-
'
&
"$env:MSBUILD_PATH"
/p:Configuration=Release'
# build the project
artifacts
:
expire_in
:
1 week
# save gitlab server space, we copy the files we need to deploy folder later on
paths
:
-
'
$env:EXE_RELEASE_FOLDER\YourApp.exe'
# saving exe to copy to deploy folder
-
'
$env:MSI_RELEASE_FOLDER\YourApp
Setup.msi'
# saving msi to copy to deploy folder
-
'
$env:TEST_FOLDER\'
# saving entire Test project so NUnit can run tests
test_job
:
stage
:
test
only
:
-
tags
script
:
-
'
&
"$env:NUNIT_PATH"
".\$env:TEST_FOLDER\Tests.dll"'
# running NUnit tests
artifacts
:
expire_in
:
1 week
# save gitlab server space, we copy the files we need to deploy folder later on
paths
:
-
'
.\TestResult.xml'
# saving NUnit results to copy to deploy folder
dependencies
:
-
build_job
deploy_job
:
stage
:
deploy
only
:
-
tags
script
:
# Compose a folder for each release based on commit tag.
# Assuming your tag is Rev1.0.0.1, and your last commit message is 'First commit'
# the artifact files will be copied to:
# P:\Projects\YourApp\Builds\Rev1.0.0.1 - First commit\
-
'
$commitSubject
=
git
log
-1
--pretty=%s'
-
'
$deployFolder
=
$($env:DEPLOY_FOLDER)
+
"\"
+
$($env:CI_BUILD_TAG)
+
"
-
"
+
$commitSubject
+
"\"'
# xcopy takes care of recursively creating required folders
-
'
xcopy
/y
".\$env:EXE_RELEASE_FOLDER\YourApp.exe"
"$deployFolder"'
-
'
xcopy
/y
".\$env:MSI_RELEASE_FOLDER\YourApp
Setup.msi"
"$deployFolder"'
-
'
xcopy
/y
".\TestResult.xml"
"$deployFolder"'
dependencies
:
-
build_job
-
test_job
\ No newline at end of file
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