Update templates and licenses

This commit is contained in:
James Lopez 2018-03-08 11:46:34 +01:00
parent 7734e85bc6
commit b7c47d9527
No known key found for this signature in database
GPG key ID: 756BF8E9D7C0CF39
7 changed files with 357 additions and 200 deletions

View file

@ -1,4 +1,4 @@
# See https://www.dartlang.org/tools/private-files.html # See https://www.dartlang.org/guides/libraries/private-files
# Files and directories created by pub # Files and directories created by pub
.dart_tool/ .dart_tool/

View file

@ -1,5 +1,4 @@
# C++ objects and libs # C++ objects and libs
*.slo *.slo
*.lo *.lo
*.o *.o
@ -11,7 +10,6 @@
*.dylib *.dylib
# Qt-es # Qt-es
object_script.*.Release object_script.*.Release
object_script.*.Debug object_script.*.Debug
*_plugin_import.cpp *_plugin_import.cpp
@ -35,13 +33,11 @@ Makefile*
target_wrapper.* target_wrapper.*
# QtCreator # QtCreator
*.autosave *.autosave
# QtCtreator Qml # QtCreator Qml
*.qmlproject.user *.qmlproject.user
*.qmlproject.user.* *.qmlproject.user.*
# QtCtreator CMake # QtCreator CMake
CMakeLists.txt.user* CMakeLists.txt.user*

View file

@ -31,3 +31,6 @@ vignettes/*.pdf
# Temporary files created by R markdown # Temporary files created by R markdown
*.utf8.md *.utf8.md
*.knit.md *.knit.md
# Shiny token, see https://shiny.rstudio.com/articles/shinyapps.html
rsconnect/

View file

@ -110,6 +110,14 @@ acs-*.bib
*.gaux *.gaux
*.gtex *.gtex
# htlatex
*.4ct
*.4tc
*.idv
*.lg
*.trc
*.xref
# hyperref # hyperref
*.brf *.brf

View file

@ -259,9 +259,6 @@ FakesAssemblies/
.ntvs_analysis.dat .ntvs_analysis.dat
node_modules/ node_modules/
# TypeScript v1 declaration files
typings/
# Visual Studio 6 build log # Visual Studio 6 build log
*.plg *.plg

View file

@ -36,7 +36,6 @@ variables:
KUBERNETES_VERSION: 1.8.6 KUBERNETES_VERSION: 1.8.6
HELM_VERSION: 2.6.1 HELM_VERSION: 2.6.1
CODECLIMATE_VERSION: 0.69.0
stages: stages:
- build - build
@ -286,6 +285,8 @@ production:
export CI_APPLICATION_TAG=$CI_COMMIT_SHA export CI_APPLICATION_TAG=$CI_COMMIT_SHA
export CI_CONTAINER_NAME=ci_job_build_${CI_JOB_ID} export CI_CONTAINER_NAME=ci_job_build_${CI_JOB_ID}
export TILLER_NAMESPACE=$KUBE_NAMESPACE export TILLER_NAMESPACE=$KUBE_NAMESPACE
# Extract "MAJOR.MINOR" from CI_SERVER_VERSION and generate "MAJOR-MINOR-stable" for Static Code Analysis
export SCA_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
function sast_container() { function sast_container() {
if [[ -n "$CI_REGISTRY_USER" ]]; then if [[ -n "$CI_REGISTRY_USER" ]]; then
@ -306,20 +307,16 @@ production:
} }
function codeclimate() { function codeclimate() {
cc_opts="--env CODECLIMATE_CODE="$PWD" \ docker run --env CODECLIMATE_CODE="$PWD" \
--volume "$PWD":/code \ --volume "$PWD":/code \
--volume /var/run/docker.sock:/var/run/docker.sock \ --volume /var/run/docker.sock:/var/run/docker.sock \
--volume /tmp/cc:/tmp/cc" --volume /tmp/cc:/tmp/cc \
"registry.gitlab.com/gitlab-org/security-products/codequality/codeclimate:${SCA_VERSION}" analyze -f json > codeclimate.json
docker run ${cc_opts} "codeclimate/codeclimate:${CODECLIMATE_VERSION}" init
docker run ${cc_opts} "codeclimate/codeclimate:${CODECLIMATE_VERSION}" analyze -f json > codeclimate.json
} }
function sast() { function sast() {
case "$CI_SERVER_VERSION" in case "$CI_SERVER_VERSION" in
*-ee) *-ee)
# Extract "MAJOR.MINOR" from CI_SERVER_VERSION and generate "MAJOR-MINOR-stable"
SAST_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
# Deprecation notice for CONFIDENCE_LEVEL variable # Deprecation notice for CONFIDENCE_LEVEL variable
if [ -z "$SAST_CONFIDENCE_LEVEL" -a "$CONFIDENCE_LEVEL" ]; then if [ -z "$SAST_CONFIDENCE_LEVEL" -a "$CONFIDENCE_LEVEL" ]; then
@ -331,7 +328,7 @@ production:
--env SAST_DISABLE_REMOTE_CHECKS="${SAST_DISABLE_REMOTE_CHECKS:-false}" \ --env SAST_DISABLE_REMOTE_CHECKS="${SAST_DISABLE_REMOTE_CHECKS:-false}" \
--volume "$PWD:/code" \ --volume "$PWD:/code" \
--volume /var/run/docker.sock:/var/run/docker.sock \ --volume /var/run/docker.sock:/var/run/docker.sock \
"registry.gitlab.com/gitlab-org/security-products/sast:$SAST_VERSION" /app/bin/run /code "registry.gitlab.com/gitlab-org/security-products/sast:$SCA_VERSION" /app/bin/run /code
;; ;;
*) *)
echo "GitLab EE is required" echo "GitLab EE is required"

514
vendor/licenses.csv vendored

File diff suppressed because it is too large Load diff