Upgrade vendored templates
This commit is contained in:
Alessio Caiazza
parent
3a8cf27674
commit
761a403d8e
|
|
@ -1,6 +1,6 @@
|
|||
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 https://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
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ ehthumbs_vista.db
|
|||
*.stackdump
|
||||
|
||||
# Folder config file
|
||||
Desktop.ini
|
||||
[Dd]esktop.ini
|
||||
|
||||
# Recycle Bin used on file shares
|
||||
$RECYCLE.BIN/
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
# Compiled files
|
||||
# Local .terraform directories
|
||||
**/.terraform/*
|
||||
|
||||
# .tfstate files
|
||||
*.tfstate
|
||||
*.tfstate.*.backup
|
||||
*.tfstate.backup
|
||||
*.tfstate.*
|
||||
|
||||
# Module directory
|
||||
.terraform/
|
||||
|
||||
# Variable values for development
|
||||
terraform.tfvars
|
||||
# .tfvars files
|
||||
*.tfvars
|
||||
|
|
|
|||
|
|
@ -171,11 +171,11 @@ PublishScripts/
|
|||
# NuGet Packages
|
||||
*.nupkg
|
||||
# The packages folder can be ignored because of Package Restore
|
||||
**/packages/*
|
||||
**/[Pp]ackages/*
|
||||
# except build/, which is used as an MSBuild target.
|
||||
!**/packages/build/
|
||||
!**/[Pp]ackages/build/
|
||||
# Uncomment if necessary however generally it will be regenerated when needed
|
||||
#!**/packages/repositories.config
|
||||
#!**/[Pp]ackages/repositories.config
|
||||
# NuGet v3's project.json files produces more ignorable files
|
||||
*.nuget.props
|
||||
*.nuget.targets
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Unofficial language image. Look for the different tagged releases at:
|
||||
# https://hub.docker.com/r/scorpil/rust/tags/
|
||||
image: "scorpil/rust:stable"
|
||||
# Official 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.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,86 @@
|
|||
# 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
|
||||
|
||||
Loading…
Reference in New Issue