Merge branch 'update-templates-8-16' into 'master'
Update templates - 8.16 RC1 See merge request !8505
This commit is contained in:
commit
4a463039ea
33 changed files with 294 additions and 53 deletions
2
vendor/gitignore/Android.gitignore
vendored
2
vendor/gitignore/Android.gitignore
vendored
|
@ -35,6 +35,8 @@ captures/
|
|||
# Intellij
|
||||
*.iml
|
||||
.idea/workspace.xml
|
||||
.idea/tasks.xml
|
||||
.idea/gradle.xml
|
||||
.idea/libraries
|
||||
|
||||
# Keystore files
|
||||
|
|
15
vendor/gitignore/Autotools.gitignore
vendored
15
vendor/gitignore/Autotools.gitignore
vendored
|
@ -1,6 +1,11 @@
|
|||
# http://www.gnu.org/software/automake
|
||||
|
||||
Makefile.in
|
||||
/ar-lib
|
||||
/mdate-sh
|
||||
/py-compile
|
||||
/test-driver
|
||||
/ylwrap
|
||||
|
||||
# http://www.gnu.org/software/autoconf
|
||||
|
||||
|
@ -9,10 +14,20 @@ Makefile.in
|
|||
/autoscan-*.log
|
||||
/aclocal.m4
|
||||
/compile
|
||||
/config.guess
|
||||
/config.h.in
|
||||
/config.sub
|
||||
/configure
|
||||
/configure.scan
|
||||
/depcomp
|
||||
/install-sh
|
||||
/missing
|
||||
/stamp-h1
|
||||
|
||||
# https://www.gnu.org/software/libtool/
|
||||
|
||||
/ltmain.sh
|
||||
|
||||
# http://www.gnu.org/software/texinfo
|
||||
|
||||
/texinfo.tex
|
||||
|
|
1
vendor/gitignore/CMake.gitignore
vendored
1
vendor/gitignore/CMake.gitignore
vendored
|
@ -4,4 +4,5 @@ CMakeScripts
|
|||
Makefile
|
||||
cmake_install.cmake
|
||||
install_manifest.txt
|
||||
compile_commands.json
|
||||
CTestTestfile.cmake
|
||||
|
|
13
vendor/gitignore/Clojure.gitignore
vendored
13
vendor/gitignore/Clojure.gitignore
vendored
|
@ -1,13 +0,0 @@
|
|||
pom.xml
|
||||
pom.xml.asc
|
||||
*.jar
|
||||
*.class
|
||||
/lib/
|
||||
/classes/
|
||||
/target/
|
||||
/checkouts/
|
||||
.lein-deps-sum
|
||||
.lein-repl-history
|
||||
.lein-plugins/
|
||||
.lein-failures
|
||||
.nrepl-port
|
1
vendor/gitignore/Clojure.gitignore
vendored
Symbolic link
1
vendor/gitignore/Clojure.gitignore
vendored
Symbolic link
|
@ -0,0 +1 @@
|
|||
Leiningen.gitignore
|
5
vendor/gitignore/CodeIgniter.gitignore
vendored
5
vendor/gitignore/CodeIgniter.gitignore
vendored
|
@ -4,3 +4,8 @@
|
|||
*/cache/*
|
||||
!*/cache/index.html
|
||||
!*/cache/.htaccess
|
||||
|
||||
user_guide_src/build/*
|
||||
user_guide_src/cilexer/build/*
|
||||
user_guide_src/cilexer/dist/*
|
||||
user_guide_src/cilexer/pycilexer.egg-info/*
|
||||
|
|
14
vendor/gitignore/CommonLisp.gitignore
vendored
14
vendor/gitignore/CommonLisp.gitignore
vendored
|
@ -1,3 +1,17 @@
|
|||
*.FASL
|
||||
*.fasl
|
||||
*.lisp-temp
|
||||
*.dfsl
|
||||
*.pfsl
|
||||
*.d64fsl
|
||||
*.p64fsl
|
||||
*.lx64fsl
|
||||
*.lx32fsl
|
||||
*.dx64fsl
|
||||
*.dx32fsl
|
||||
*.fx64fsl
|
||||
*.fx32fsl
|
||||
*.sx64fsl
|
||||
*.sx32fsl
|
||||
*.wx64fsl
|
||||
*.wx32fsl
|
||||
|
|
29
vendor/gitignore/Coq.gitignore
vendored
29
vendor/gitignore/Coq.gitignore
vendored
|
@ -1,3 +1,30 @@
|
|||
*.vo
|
||||
.*.aux
|
||||
*.a
|
||||
*.cma
|
||||
*.cmi
|
||||
*.cmo
|
||||
*.cmx
|
||||
*.cmxa
|
||||
*.cmxs
|
||||
*.glob
|
||||
*.ml.d
|
||||
*.ml4.d
|
||||
*.mli.d
|
||||
*.mllib.d
|
||||
*.mlpack.d
|
||||
*.native
|
||||
*.o
|
||||
*.v.d
|
||||
*.vio
|
||||
*.vo
|
||||
.coq-native/
|
||||
.csdp.cache
|
||||
.lia.cache
|
||||
.nia.cache
|
||||
.nlia.cache
|
||||
.nra.cache
|
||||
csdp.cache
|
||||
lia.cache
|
||||
nia.cache
|
||||
nlia.cache
|
||||
nra.cache
|
||||
|
|
10
vendor/gitignore/Dart.gitignore
vendored
10
vendor/gitignore/Dart.gitignore
vendored
|
@ -1,13 +1,19 @@
|
|||
# See https://www.dartlang.org/tools/private-files.html
|
||||
|
||||
# Files and directories created by pub
|
||||
.buildlog
|
||||
|
||||
# SDK 1.20 and later (no longer creates packages directories)
|
||||
.packages
|
||||
.project
|
||||
.pub/
|
||||
build/
|
||||
|
||||
# Older SDK versions
|
||||
# (Include if the minimum SDK version specified in pubsepc.yaml is earlier than 1.20)
|
||||
.project
|
||||
.buildlog
|
||||
**/packages/
|
||||
|
||||
|
||||
# Files created by dart2js
|
||||
# (Most Dart developers will use pub build to compile Dart, use/modify these
|
||||
# rules if you intend to use dart2js directly
|
||||
|
|
6
vendor/gitignore/Elisp.gitignore
vendored
6
vendor/gitignore/Elisp.gitignore
vendored
|
@ -3,3 +3,9 @@
|
|||
|
||||
# Packaging
|
||||
.cask
|
||||
|
||||
# Backup files
|
||||
*~
|
||||
|
||||
# Undo-tree save-files
|
||||
*.~undo-tree
|
||||
|
|
1
vendor/gitignore/Elixir.gitignore
vendored
1
vendor/gitignore/Elixir.gitignore
vendored
|
@ -3,3 +3,4 @@
|
|||
/deps
|
||||
erl_crash.dump
|
||||
*.ez
|
||||
*.beam
|
||||
|
|
3
vendor/gitignore/Global/Emacs.gitignore
vendored
3
vendor/gitignore/Global/Emacs.gitignore
vendored
|
@ -40,3 +40,6 @@ flycheck_*.el
|
|||
|
||||
# projectiles files
|
||||
.projectile
|
||||
|
||||
# directory configuration
|
||||
.dir-locals.el
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
# Temporary data
|
||||
.ipynb_checkpoints/
|
1
vendor/gitignore/Global/JetBrains.gitignore
vendored
1
vendor/gitignore/Global/JetBrains.gitignore
vendored
|
@ -6,6 +6,7 @@
|
|||
.idea/tasks.xml
|
||||
|
||||
# Sensitive or high-churn files:
|
||||
.idea/dataSources/
|
||||
.idea/dataSources.ids
|
||||
.idea/dataSources.xml
|
||||
.idea/dataSources.local.xml
|
||||
|
|
|
@ -20,6 +20,9 @@ Package Control.ca-bundle
|
|||
Package Control.system-ca-bundle
|
||||
Package Control.cache/
|
||||
Package Control.ca-certs/
|
||||
Package Control.merged-ca-bundle
|
||||
Package Control.user-ca-bundle
|
||||
oscrypto-ca-bundle.crt
|
||||
bh_unicode_properties.cache
|
||||
|
||||
# Sublime-github package stores a github token in this file
|
||||
|
|
6
vendor/gitignore/Global/Vim.gitignore
vendored
6
vendor/gitignore/Global/Vim.gitignore
vendored
|
@ -1,6 +1,8 @@
|
|||
# swap
|
||||
[._]*.s[a-w][a-z]
|
||||
[._]s[a-w][a-z]
|
||||
[._]*.s[a-v][a-z]
|
||||
[._]*.sw[a-p]
|
||||
[._]s[a-v][a-z]
|
||||
[._]sw[a-p]
|
||||
# session
|
||||
Session.vim
|
||||
# temporary
|
||||
|
|
|
@ -2,3 +2,4 @@
|
|||
!.vscode/settings.json
|
||||
!.vscode/tasks.json
|
||||
!.vscode/launch.json
|
||||
!.vscode/extensions.json
|
||||
|
|
3
vendor/gitignore/Global/Windows.gitignore
vendored
3
vendor/gitignore/Global/Windows.gitignore
vendored
|
@ -1,6 +1,7 @@
|
|||
# Windows image file caches
|
||||
# Windows thumbnail cache files
|
||||
Thumbs.db
|
||||
ehthumbs.db
|
||||
ehthumbs_vista.db
|
||||
|
||||
# Folder config file
|
||||
Desktop.ini
|
||||
|
|
2
vendor/gitignore/Go.gitignore
vendored
2
vendor/gitignore/Go.gitignore
vendored
|
@ -26,5 +26,5 @@ _testmain.go
|
|||
# Output of the go coverage tool, specifically when used with LiteIDE
|
||||
*.out
|
||||
|
||||
# external packages folder
|
||||
# External packages folder
|
||||
vendor/
|
||||
|
|
3
vendor/gitignore/Java.gitignore
vendored
3
vendor/gitignore/Java.gitignore
vendored
|
@ -1,5 +1,8 @@
|
|||
*.class
|
||||
|
||||
# BlueJ files
|
||||
*.ctxt
|
||||
|
||||
# Mobile Tools for Java (J2ME)
|
||||
.mtj.tmp/
|
||||
|
||||
|
|
2
vendor/gitignore/Laravel.gitignore
vendored
2
vendor/gitignore/Laravel.gitignore
vendored
|
@ -6,8 +6,8 @@ bootstrap/compiled.php
|
|||
app/storage/
|
||||
|
||||
# Laravel 5 & Lumen specific
|
||||
bootstrap/cache/
|
||||
public/storage
|
||||
storage/*.key
|
||||
.env.*.php
|
||||
.env.php
|
||||
.env
|
||||
|
|
3
vendor/gitignore/Maven.gitignore
vendored
3
vendor/gitignore/Maven.gitignore
vendored
|
@ -7,3 +7,6 @@ release.properties
|
|||
dependency-reduced-pom.xml
|
||||
buildNumber.properties
|
||||
.mvn/timing.properties
|
||||
|
||||
# Exclude maven wrapper
|
||||
!/.mvn/wrapper/maven-wrapper.jar
|
||||
|
|
4
vendor/gitignore/Node.gitignore
vendored
4
vendor/gitignore/Node.gitignore
vendored
|
@ -42,3 +42,7 @@ jspm_packages
|
|||
|
||||
# Output of 'npm pack'
|
||||
*.tgz
|
||||
|
||||
# Yarn Integrity file
|
||||
.yarn-integrity
|
||||
|
||||
|
|
38
vendor/gitignore/Perl.gitignore
vendored
38
vendor/gitignore/Perl.gitignore
vendored
|
@ -1,20 +1,34 @@
|
|||
/blib/
|
||||
/.build/
|
||||
_build/
|
||||
cover_db/
|
||||
inc/
|
||||
Build
|
||||
!Build/
|
||||
Build.bat
|
||||
.last_cover_stats
|
||||
/Makefile
|
||||
/Makefile.old
|
||||
/MANIFEST.bak
|
||||
/META.yml
|
||||
/META.json
|
||||
/MYMETA.*
|
||||
nytprof.out
|
||||
/pm_to_blib
|
||||
*.o
|
||||
*.bs
|
||||
|
||||
# Devel::Cover
|
||||
cover_db/
|
||||
|
||||
# Devel::NYTProf
|
||||
nytprof.out
|
||||
|
||||
# Dizt::Zilla
|
||||
/.build/
|
||||
|
||||
# Module::Build
|
||||
_build/
|
||||
Build
|
||||
Build.bat
|
||||
|
||||
# Module::Install
|
||||
inc/
|
||||
|
||||
# ExtUitls::MakeMaker
|
||||
/blib/
|
||||
/_eumm/
|
||||
/*.gz
|
||||
/Makefile
|
||||
/Makefile.old
|
||||
/MANIFEST.bak
|
||||
/pm_to_blib
|
||||
/*.zip
|
||||
|
|
1
vendor/gitignore/Python.gitignore
vendored
1
vendor/gitignore/Python.gitignore
vendored
|
@ -20,6 +20,7 @@ lib64/
|
|||
parts/
|
||||
sdist/
|
||||
var/
|
||||
wheels/
|
||||
*.egg-info/
|
||||
.installed.cfg
|
||||
*.egg
|
||||
|
|
5
vendor/gitignore/Symfony.gitignore
vendored
5
vendor/gitignore/Symfony.gitignore
vendored
|
@ -31,9 +31,6 @@
|
|||
/web/bundles/
|
||||
/web/uploads/
|
||||
|
||||
# Assets managed by Bower
|
||||
/web/assets/vendor/
|
||||
|
||||
# PHPUnit
|
||||
/app/phpunit.xml
|
||||
/phpunit.xml
|
||||
|
@ -45,4 +42,4 @@
|
|||
/composer.phar
|
||||
|
||||
# Backup entities generated with doctrine:generate:entities command
|
||||
*/Entity/*~
|
||||
**/Entity/*~
|
||||
|
|
20
vendor/gitignore/TeX.gitignore
vendored
20
vendor/gitignore/TeX.gitignore
vendored
|
@ -52,12 +52,22 @@ acs-*.bib
|
|||
|
||||
# beamer
|
||||
*.nav
|
||||
*.pre
|
||||
*.snm
|
||||
*.vrb
|
||||
|
||||
# changes
|
||||
*.soc
|
||||
|
||||
# cprotect
|
||||
*.cpt
|
||||
|
||||
# elsarticle (documentclass of Elsevier journals)
|
||||
*.spl
|
||||
|
||||
# endnotes
|
||||
*.ent
|
||||
|
||||
# fixme
|
||||
*.lox
|
||||
|
||||
|
@ -123,9 +133,7 @@ acs-*.bib
|
|||
*.maf
|
||||
*.mlf
|
||||
*.mlt
|
||||
*.mtc
|
||||
*.mtc[0-9]
|
||||
*.mtc[1-9][0-9]
|
||||
*.mtc[0-9]*
|
||||
|
||||
# minted
|
||||
_minted*
|
||||
|
@ -140,6 +148,9 @@ _minted*
|
|||
# nomencl
|
||||
*.nlo
|
||||
|
||||
# pax
|
||||
*.pax
|
||||
|
||||
# sagetex
|
||||
*.sagetex.sage
|
||||
*.sagetex.py
|
||||
|
@ -204,3 +215,6 @@ TSWLatexianTemp*
|
|||
|
||||
# auto folder when using emacs and auctex
|
||||
/auto/*
|
||||
|
||||
# expex forward references with \gathertags
|
||||
*-tags.tex
|
||||
|
|
5
vendor/gitignore/VisualStudio.gitignore
vendored
5
vendor/gitignore/VisualStudio.gitignore
vendored
|
@ -8,7 +8,6 @@
|
|||
*.user
|
||||
*.userosscache
|
||||
*.sln.docstates
|
||||
*.vcxproj.filters
|
||||
|
||||
# User-specific files (MonoDevelop/Xamarin Studio)
|
||||
*.userprefs
|
||||
|
@ -43,11 +42,11 @@ TestResult.xml
|
|||
[Rr]eleasePS/
|
||||
dlldata.c
|
||||
|
||||
# DNX
|
||||
# .NET Core
|
||||
project.lock.json
|
||||
project.fragment.lock.json
|
||||
artifacts/
|
||||
Properties/launchSettings.json
|
||||
**/Properties/launchSettings.json
|
||||
|
||||
*_i.c
|
||||
*_p.c
|
||||
|
|
5
vendor/gitlab-ci-yml/Docker.gitlab-ci.yml
vendored
5
vendor/gitlab-ci-yml/Docker.gitlab-ci.yml
vendored
|
@ -7,6 +7,7 @@ services:
|
|||
build:
|
||||
stage: build
|
||||
script:
|
||||
- export IMAGE_TAG=$(echo -en $CI_BUILD_REF_NAME | tr -c '[:alnum:]_.-' '-')
|
||||
- docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
|
||||
- docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME" .
|
||||
- docker push "$CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME"
|
||||
- docker build --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" .
|
||||
- docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
|
||||
|
|
6
vendor/gitlab-ci-yml/Elixir.gitlab-ci.yml
vendored
6
vendor/gitlab-ci-yml/Elixir.gitlab-ci.yml
vendored
|
@ -1,6 +1,4 @@
|
|||
# This template uses the non default language docker image
|
||||
# The image already has Hex installed. You might want to consider to use `elixir:latest`
|
||||
image: trenpixster/elixir:latest
|
||||
image: elixir:latest
|
||||
|
||||
# Pick zero or more services to be used on all builds.
|
||||
# Only needed when using a docker container to run your tests in.
|
||||
|
@ -11,6 +9,8 @@ services:
|
|||
- postgres:latest
|
||||
|
||||
before_script:
|
||||
- mix local.rebar --force
|
||||
- mix local.hex --force
|
||||
- mix deps.get
|
||||
|
||||
mix:
|
||||
|
|
37
vendor/gitlab-ci-yml/Go.gitlab-ci.yml
vendored
Normal file
37
vendor/gitlab-ci-yml/Go.gitlab-ci.yml
vendored
Normal file
|
@ -0,0 +1,37 @@
|
|||
image: golang:latest
|
||||
|
||||
# The problem is that to be able to use go get, one needs to put
|
||||
# the repository in the $GOPATH. So for example if your gitlab domain
|
||||
# is mydomainperso.com, and that your repository is repos/projectname, and
|
||||
# the default GOPATH being /go, then you'd need to have your
|
||||
# repository in /go/src/mydomainperso.com/repos/projectname
|
||||
# Thus, making a symbolic link corrects this.
|
||||
before_script:
|
||||
- ln -s /builds /go/src/mydomainperso.com
|
||||
- cd /go/src/mydomainperso.com/repos/projectname
|
||||
|
||||
stages:
|
||||
- test
|
||||
- build
|
||||
|
||||
format:
|
||||
stage: test
|
||||
script:
|
||||
# Add here all the dependencies, or use glide/govendor to get
|
||||
# them automatically.
|
||||
# - curl https://glide.sh/get | sh
|
||||
- go get github.com/alecthomas/kingpin
|
||||
- go tool vet -composites=false -shadow=true *.go
|
||||
- go test -race $(go list ./... | grep -v /vendor/)
|
||||
|
||||
compile:
|
||||
stage: build
|
||||
script:
|
||||
# Add here all the dependencies, or use glide/govendor/...
|
||||
# to get them automatically.
|
||||
- go get github.com/alecthomas/kingpin
|
||||
# Better put this in a Makefile
|
||||
- go build -race -ldflags "-extldflags '-static'" -o mybinary
|
||||
artifacts:
|
||||
paths:
|
||||
- mybinary
|
2
vendor/gitlab-ci-yml/Gradle.gitlab-ci.yml
vendored
2
vendor/gitlab-ci-yml/Gradle.gitlab-ci.yml
vendored
|
@ -31,4 +31,4 @@ build:
|
|||
test:
|
||||
stage: test
|
||||
script:
|
||||
- ./gradlew -g /cache./gradle check
|
||||
- ./gradlew -g /cache/.gradle check
|
||||
|
|
92
vendor/gitlab-ci-yml/Openshift.gitlab-ci.yml
vendored
Normal file
92
vendor/gitlab-ci-yml/Openshift.gitlab-ci.yml
vendored
Normal file
|
@ -0,0 +1,92 @@
|
|||
# This file is a template, and might need editing before it works on your project.
|
||||
image: ayufan/openshift-cli
|
||||
|
||||
stages:
|
||||
- test
|
||||
- review
|
||||
- staging
|
||||
- production
|
||||
|
||||
variables:
|
||||
OPENSHIFT_SERVER: openshift.default.svc.cluster.local
|
||||
# OPENSHIFT_DOMAIN: apps.example.com
|
||||
# Configure this variable in Secure Variables:
|
||||
# OPENSHIFT_TOKEN: my.openshift.token
|
||||
|
||||
test1:
|
||||
stage: test
|
||||
before_script: []
|
||||
script:
|
||||
- echo run tests
|
||||
|
||||
test2:
|
||||
stage: test
|
||||
before_script: []
|
||||
script:
|
||||
- echo run tests
|
||||
|
||||
.deploy: &deploy
|
||||
before_script:
|
||||
- oc login "$OPENSHIFT_SERVER" --token="$OPENSHIFT_TOKEN" --insecure-skip-tls-verify
|
||||
- oc project "$CI_PROJECT_NAME" 2> /dev/null || oc new-project "$CI_PROJECT_NAME"
|
||||
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 get routes $APP 2> /dev/null || oc expose service $APP --hostname=$APP_HOST"
|
||||
|
||||
review:
|
||||
<<: *deploy
|
||||
stage: review
|
||||
variables:
|
||||
APP: $CI_BUILD_REF_NAME
|
||||
APP_HOST: $CI_PROJECT_NAME-$CI_BUILD_REF_NAME.$OPENSHIFT_DOMAIN
|
||||
environment:
|
||||
name: review/$CI_BUILD_REF_NAME
|
||||
url: http://$CI_PROJECT_NAME-$CI_BUILD_REF_NAME.$OPENSHIFT_DOMAIN
|
||||
on_stop: stop-review
|
||||
only:
|
||||
- branches
|
||||
except:
|
||||
- master
|
||||
|
||||
stop-review:
|
||||
<<: *deploy
|
||||
stage: review
|
||||
script:
|
||||
- oc delete all -l "app=$APP"
|
||||
when: manual
|
||||
variables:
|
||||
APP: $CI_BUILD_REF_NAME
|
||||
GIT_STRATEGY: none
|
||||
environment:
|
||||
name: review/$CI_BUILD_REF_NAME
|
||||
action: stop
|
||||
only:
|
||||
- branches
|
||||
except:
|
||||
- master
|
||||
|
||||
staging:
|
||||
<<: *deploy
|
||||
stage: staging
|
||||
variables:
|
||||
APP: staging
|
||||
APP_HOST: $CI_PROJECT_NAME-staging.$OPENSHIFT_DOMAIN
|
||||
environment:
|
||||
name: staging
|
||||
url: http://$CI_PROJECT_NAME-staging.$OPENSHIFT_DOMAIN
|
||||
only:
|
||||
- master
|
||||
|
||||
production:
|
||||
<<: *deploy
|
||||
stage: production
|
||||
variables:
|
||||
APP: production
|
||||
APP_HOST: $CI_PROJECT_NAME.$OPENSHIFT_DOMAIN
|
||||
when: manual
|
||||
environment:
|
||||
name: production
|
||||
url: http://$CI_PROJECT_NAME.$OPENSHIFT_DOMAIN
|
||||
only:
|
||||
- master
|
|
@ -1,3 +1,5 @@
|
|||
# Explaination on the scripts:
|
||||
# https://gitlab.com/gitlab-examples/openshift-deploy/blob/master/README.md
|
||||
image: registry.gitlab.com/gitlab-examples/openshift-deploy
|
||||
|
||||
variables:
|
||||
|
|
Loading…
Reference in a new issue