Commit 719294cb authored by James Lopez's avatar James Lopez

update templates

parent 583deef2
...@@ -35,6 +35,8 @@ captures/ ...@@ -35,6 +35,8 @@ captures/
# Intellij # Intellij
*.iml *.iml
.idea/workspace.xml .idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/libraries .idea/libraries
# Keystore files # Keystore files
......
# http://www.gnu.org/software/automake # http://www.gnu.org/software/automake
Makefile.in Makefile.in
/ar-lib
/mdate-sh
/py-compile
/test-driver
/ylwrap
# http://www.gnu.org/software/autoconf # http://www.gnu.org/software/autoconf
...@@ -9,10 +14,20 @@ Makefile.in ...@@ -9,10 +14,20 @@ Makefile.in
/autoscan-*.log /autoscan-*.log
/aclocal.m4 /aclocal.m4
/compile /compile
/config.guess
/config.h.in /config.h.in
/config.sub
/configure /configure
/configure.scan /configure.scan
/depcomp /depcomp
/install-sh /install-sh
/missing /missing
/stamp-h1 /stamp-h1
# https://www.gnu.org/software/libtool/
/ltmain.sh
# http://www.gnu.org/software/texinfo
/texinfo.tex
...@@ -4,4 +4,5 @@ CMakeScripts ...@@ -4,4 +4,5 @@ CMakeScripts
Makefile Makefile
cmake_install.cmake cmake_install.cmake
install_manifest.txt install_manifest.txt
compile_commands.json
CTestTestfile.cmake CTestTestfile.cmake
pom.xml
pom.xml.asc
*.jar
*.class
/lib/
/classes/
/target/
/checkouts/
.lein-deps-sum
.lein-repl-history
.lein-plugins/
.lein-failures
.nrepl-port
Leiningen.gitignore
\ No newline at end of file
...@@ -4,3 +4,8 @@ ...@@ -4,3 +4,8 @@
*/cache/* */cache/*
!*/cache/index.html !*/cache/index.html
!*/cache/.htaccess !*/cache/.htaccess
user_guide_src/build/*
user_guide_src/cilexer/build/*
user_guide_src/cilexer/dist/*
user_guide_src/cilexer/pycilexer.egg-info/*
*.FASL *.FASL
*.fasl *.fasl
*.lisp-temp *.lisp-temp
*.dfsl
*.pfsl
*.d64fsl
*.p64fsl
*.lx64fsl
*.lx32fsl
*.dx64fsl
*.dx32fsl
*.fx64fsl
*.fx32fsl
*.sx64fsl
*.sx32fsl
*.wx64fsl
*.wx32fsl
*.vo .*.aux
*.a
*.cma
*.cmi
*.cmo
*.cmx
*.cmxa
*.cmxs
*.glob *.glob
*.ml.d
*.ml4.d
*.mli.d
*.mllib.d
*.mlpack.d
*.native
*.o
*.v.d *.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
# See https://www.dartlang.org/tools/private-files.html # See https://www.dartlang.org/tools/private-files.html
# Files and directories created by pub # Files and directories created by pub
.buildlog
# SDK 1.20 and later (no longer creates packages directories)
.packages .packages
.project
.pub/ .pub/
build/ build/
# Older SDK versions
# (Include if the minimum SDK version specified in pubsepc.yaml is earlier than 1.20)
.project
.buildlog
**/packages/ **/packages/
# Files created by dart2js # Files created by dart2js
# (Most Dart developers will use pub build to compile Dart, use/modify these # (Most Dart developers will use pub build to compile Dart, use/modify these
# rules if you intend to use dart2js directly # rules if you intend to use dart2js directly
......
...@@ -3,3 +3,9 @@ ...@@ -3,3 +3,9 @@
# Packaging # Packaging
.cask .cask
# Backup files
*~
# Undo-tree save-files
*.~undo-tree
...@@ -3,3 +3,4 @@ ...@@ -3,3 +3,4 @@
/deps /deps
erl_crash.dump erl_crash.dump
*.ez *.ez
*.beam
...@@ -39,4 +39,7 @@ flycheck_*.el ...@@ -39,4 +39,7 @@ flycheck_*.el
/server/ /server/
# projectiles files # projectiles files
.projectile .projectile
\ No newline at end of file
# directory configuration
.dir-locals.el
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
.idea/tasks.xml .idea/tasks.xml
# Sensitive or high-churn files: # Sensitive or high-churn files:
.idea/dataSources/
.idea/dataSources.ids .idea/dataSources.ids
.idea/dataSources.xml .idea/dataSources.xml
.idea/dataSources.local.xml .idea/dataSources.local.xml
......
...@@ -20,6 +20,9 @@ Package Control.ca-bundle ...@@ -20,6 +20,9 @@ Package Control.ca-bundle
Package Control.system-ca-bundle Package Control.system-ca-bundle
Package Control.cache/ Package Control.cache/
Package Control.ca-certs/ Package Control.ca-certs/
Package Control.merged-ca-bundle
Package Control.user-ca-bundle
oscrypto-ca-bundle.crt
bh_unicode_properties.cache bh_unicode_properties.cache
# Sublime-github package stores a github token in this file # Sublime-github package stores a github token in this file
......
# swap # swap
[._]*.s[a-w][a-z] [._]*.s[a-v][a-z]
[._]s[a-w][a-z] [._]*.sw[a-p]
[._]s[a-v][a-z]
[._]sw[a-p]
# session # session
Session.vim Session.vim
# temporary # temporary
......
...@@ -2,3 +2,4 @@ ...@@ -2,3 +2,4 @@
!.vscode/settings.json !.vscode/settings.json
!.vscode/tasks.json !.vscode/tasks.json
!.vscode/launch.json !.vscode/launch.json
!.vscode/extensions.json
# Windows image file caches # Windows thumbnail cache files
Thumbs.db Thumbs.db
ehthumbs.db ehthumbs.db
ehthumbs_vista.db
# Folder config file # Folder config file
Desktop.ini Desktop.ini
......
...@@ -26,5 +26,5 @@ _testmain.go ...@@ -26,5 +26,5 @@ _testmain.go
# Output of the go coverage tool, specifically when used with LiteIDE # Output of the go coverage tool, specifically when used with LiteIDE
*.out *.out
# external packages folder # External packages folder
vendor/ vendor/
*.class *.class
# BlueJ files
*.ctxt
# Mobile Tools for Java (J2ME) # Mobile Tools for Java (J2ME)
.mtj.tmp/ .mtj.tmp/
......
...@@ -6,8 +6,8 @@ bootstrap/compiled.php ...@@ -6,8 +6,8 @@ bootstrap/compiled.php
app/storage/ app/storage/
# Laravel 5 & Lumen specific # Laravel 5 & Lumen specific
bootstrap/cache/
public/storage public/storage
storage/*.key
.env.*.php .env.*.php
.env.php .env.php
.env .env
......
...@@ -7,3 +7,6 @@ release.properties ...@@ -7,3 +7,6 @@ release.properties
dependency-reduced-pom.xml dependency-reduced-pom.xml
buildNumber.properties buildNumber.properties
.mvn/timing.properties .mvn/timing.properties
# Exclude maven wrapper
!/.mvn/wrapper/maven-wrapper.jar
...@@ -42,3 +42,7 @@ jspm_packages ...@@ -42,3 +42,7 @@ jspm_packages
# Output of 'npm pack' # Output of 'npm pack'
*.tgz *.tgz
# Yarn Integrity file
.yarn-integrity
/blib/
/.build/
_build/
cover_db/
inc/
Build
!Build/ !Build/
Build.bat
.last_cover_stats .last_cover_stats
/Makefile
/Makefile.old
/MANIFEST.bak
/META.yml /META.yml
/META.json /META.json
/MYMETA.* /MYMETA.*
nytprof.out
/pm_to_blib
*.o *.o
*.bs *.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/ /_eumm/
/*.gz
/Makefile
/Makefile.old
/MANIFEST.bak
/pm_to_blib
/*.zip
...@@ -20,6 +20,7 @@ lib64/ ...@@ -20,6 +20,7 @@ lib64/
parts/ parts/
sdist/ sdist/
var/ var/
wheels/
*.egg-info/ *.egg-info/
.installed.cfg .installed.cfg
*.egg *.egg
......
...@@ -31,9 +31,6 @@ ...@@ -31,9 +31,6 @@
/web/bundles/ /web/bundles/
/web/uploads/ /web/uploads/
# Assets managed by Bower
/web/assets/vendor/
# PHPUnit # PHPUnit
/app/phpunit.xml /app/phpunit.xml
/phpunit.xml /phpunit.xml
...@@ -45,4 +42,4 @@ ...@@ -45,4 +42,4 @@
/composer.phar /composer.phar
# Backup entities generated with doctrine:generate:entities command # Backup entities generated with doctrine:generate:entities command
*/Entity/*~ **/Entity/*~
...@@ -52,12 +52,22 @@ acs-*.bib ...@@ -52,12 +52,22 @@ acs-*.bib
# beamer # beamer
*.nav *.nav
*.pre
*.snm *.snm
*.vrb *.vrb
# changes
*.soc
# cprotect # cprotect
*.cpt *.cpt
# elsarticle (documentclass of Elsevier journals)
*.spl
# endnotes
*.ent
# fixme # fixme
*.lox *.lox
...@@ -123,9 +133,7 @@ acs-*.bib ...@@ -123,9 +133,7 @@ acs-*.bib
*.maf *.maf
*.mlf *.mlf
*.mlt *.mlt
*.mtc *.mtc[0-9]*
*.mtc[0-9]
*.mtc[1-9][0-9]
# minted # minted
_minted* _minted*
...@@ -140,6 +148,9 @@ _minted* ...@@ -140,6 +148,9 @@ _minted*
# nomencl # nomencl
*.nlo *.nlo
# pax
*.pax
# sagetex # sagetex
*.sagetex.sage *.sagetex.sage
*.sagetex.py *.sagetex.py
...@@ -202,5 +213,8 @@ TSWLatexianTemp* ...@@ -202,5 +213,8 @@ TSWLatexianTemp*
# KBibTeX # KBibTeX
*~[0-9]* *~[0-9]*
# auto folder when using emacs and auctex # auto folder when using emacs and auctex
/auto/* /auto/*
# expex forward references with \gathertags
*-tags.tex
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
*.user *.user
*.userosscache *.userosscache
*.sln.docstates *.sln.docstates
*.vcxproj.filters
# User-specific files (MonoDevelop/Xamarin Studio) # User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs *.userprefs
...@@ -43,11 +42,11 @@ TestResult.xml ...@@ -43,11 +42,11 @@ TestResult.xml
[Rr]eleasePS/ [Rr]eleasePS/
dlldata.c dlldata.c
# DNX # .NET Core
project.lock.json project.lock.json
project.fragment.lock.json project.fragment.lock.json
artifacts/ artifacts/
Properties/launchSettings.json **/Properties/launchSettings.json
*_i.c *_i.c
*_p.c *_p.c
......
...@@ -7,6 +7,7 @@ services: ...@@ -7,6 +7,7 @@ services:
build: build:
stage: build stage: build
script: 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 login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
- docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME" . - docker build --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" .
- docker push "$CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME" - docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
# This template uses the non default language docker image image: elixir:latest
# The image already has Hex installed. You might want to consider to use `elixir:latest`
image: trenpixster/elixir:latest
# Pick zero or more services to be used on all builds. # Pick zero or more services to be used on all builds.
# Only needed when using a docker container to run your tests in. # Only needed when using a docker container to run your tests in.
...@@ -11,6 +9,8 @@ services: ...@@ -11,6 +9,8 @@ services:
- postgres:latest - postgres:latest
before_script: before_script:
- mix local.rebar --force
- mix local.hex --force
- mix deps.get - mix deps.get
mix: mix:
......
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
...@@ -31,4 +31,4 @@ build: ...@@ -31,4 +31,4 @@ build:
test: test:
stage: test stage: test
script: script:
- ./gradlew -g /cache./gradle check - ./gradlew -g /cache/.gradle check
image: registry.gitlab.com/gitlab-examples/openshift-deploy # This file is a template, and might need editing before it works on your project.
image: ayufan/openshift-cli
variables:
# Application deployment domain
KUBE_DOMAIN: domain.example.com
stages: stages:
- build
- test - test
- review - review
- staging - staging
- production - production
build: variables:
stage: build 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: script:
- command build - echo run tests
only:
- branches
production: test2:
stage: production stage: test
variables: before_script: []
CI_ENVIRONMENT_URL: http://production.$KUBE_DOMAIN
script: script:
- command deploy - echo run tests
environment:
name: production
url: http://production.$KUBE_DOMAIN
when: manual
only:
- master
staging: .deploy: &deploy
stage: staging before_script:
variables: - oc login "$OPENSHIFT_SERVER" --token="$OPENSHIFT_TOKEN" --insecure-skip-tls-verify
CI_ENVIRONMENT_URL: http://staging.$KUBE_DOMAIN - oc project "$CI_PROJECT_NAME" 2> /dev/null || oc new-project "$CI_PROJECT_NAME"
script: script:
- command deploy - "oc get services $APP 2> /dev/null || oc new-app . --name=$APP --strategy=docker"
environment: - "oc start-build $APP --from-dir=. --follow || sleep 3s || oc start-build $APP --from-dir=. --follow"
name: staging - "oc get routes $APP 2> /dev/null || oc expose service $APP --hostname=$APP_HOST"
url: http://staging.$KUBE_DOMAIN
only:
- master
review: review:
<<: *deploy
stage: review stage: review
variables: variables:
CI_ENVIRONMENT_URL: http://$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN APP: $CI_BUILD_REF_NAME
script: APP_HOST: $CI_PROJECT_NAME-$CI_BUILD_REF_NAME.$OPENSHIFT_DOMAIN
- command deploy
environment: environment:
name: review/$CI_BUILD_REF_NAME name: review/$CI_BUILD_REF_NAME
url: http://$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN url: http://$CI_PROJECT_NAME-$CI_BUILD_REF_NAME.$OPENSHIFT_DOMAIN
on_stop: stop_review on_stop: stop-review
only: only:
- branches - branches
except: except:
- master - master
stop_review: stop-review:
<<: *deploy
stage: review stage: review
script:
- oc delete all -l "app=$APP"
when: manual
variables: variables:
APP: $CI_BUILD_REF_NAME
GIT_STRATEGY: none GIT_STRATEGY: none
script:
- command destroy
environment: environment:
name: review/$CI_BUILD_REF_NAME name: