Commit 4ddc5dba authored by Marin Jankovski's avatar Marin Jankovski

Merge branch '10-4-templates-update' into 'master'

10.4 templates update

Closes #10

See merge request gitlab-org/gitlab-ce!16266
parents 59b11c3d 2837cc17
Pipeline #15878377 passed with stages
in 51 minutes and 58 seconds
......@@ -4,6 +4,9 @@
*.s#?
*.b#?
*.l#?
*.b$?
*.s$?
*.l$?
# Eagle project file
# It contains a serial number and references to the file structure
......@@ -31,14 +34,19 @@ eagle.epf
*.drl
*.gpi
*.pls
*.ger
*.gpi
*.xln
*.drd
*.drd.*
*.s#*
*.b#*
*.info
*.eps
# file locks introduced since 7.x
*.lck
......@@ -23,6 +23,9 @@ local.properties
# CDT-specific (C/C++ Development Tooling)
.cproject
# CDT- autotools
.autotools
# Java annotation processor (APT)
.factorypath
......
......@@ -21,6 +21,7 @@
# CMake
cmake-build-debug/
cmake-build-release/
# Mongo Explorer plugin:
.idea/**/mongoSettings.xml
......
##---------------------------------------------------
## Remove autosaves generated by the MATLAB editor
## We have git for backups!
##---------------------------------------------------
# Windows default autosave extension
*.asv
......@@ -12,12 +7,19 @@
# Compiled MEX binaries (all platforms)
*.mex*
# Simulink Code Generation
# Packaged app and toolbox files
*.mlappinstall
*.mltbx
# Generated helpsearch folders
helpsearch*/
# Simulink code generation folders
slprj/
sccprj/
# Session info
octave-workspace
# Simulink autosave extension
*.autosave
# Octave session info
octave-workspace
# Binaries for programs and plugins
*.exe
*.exe~
*.dll
*.so
*.dylib
......
......@@ -57,3 +57,5 @@ typings/
# dotenv environment variables file
.env
# next.js build output
.next
......@@ -42,3 +42,7 @@ bower.json
# Ignore Byebug command history file.
.byebug_history
# Ignore node_modules
node_modules/
......@@ -16,8 +16,11 @@
# Don't ignore Umbraco packages (VisualStudio.gitignore mistakes this for a NuGet packages folder)
# Make sure to include details from VisualStudio.gitignore BEFORE this
!**/App_Data/[Pp]ackages/
!**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages
!**/App_Data/[Pp]ackages/*
!**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages/*
# ImageProcessor DiskCache
**/App_Data/cache/
# Ignore the Models Builder models out of date flag
**/App_Data/Models/ood.flag
......@@ -219,6 +219,10 @@ ClientBin/
*.publishsettings
orleans.codegen.cs
# Including strong name files can present a security risk
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
#*.snk
# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/
......@@ -313,3 +317,7 @@ OpenCover/
# Azure Stream Analytics local run output
ASALocalRun/
# MSBuild Binary and Structured Log
*.binlog
......@@ -7,6 +7,7 @@ wp-content/blogs.dir/
wp-content/cache/
wp-content/upgrade/
wp-content/uploads/
wp-content/mu-plugins/
wp-content/wp-cache-config.php
wp-content/plugins/hello.php
......
......@@ -112,6 +112,19 @@ sast:
- sast .
artifacts:
paths: [gl-sast-report.json]
sast:container:
image: docker:latest
variables:
DOCKER_DRIVER: overlay2
allow_failure: true
services:
- docker:dind
script:
- setup_docker
- sast_container
artifacts:
paths: [gl-sast-container-report.json]
review:
stage: review
......@@ -247,6 +260,18 @@ production:
export CI_APPLICATION_TAG=$CI_COMMIT_SHA
export CI_CONTAINER_NAME=ci_job_build_${CI_JOB_ID}
export TILLER_NAMESPACE=$KUBE_NAMESPACE
function sast_container() {
docker run -d --name db arminc/clair-db:latest
docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.1
apk add -U wget ca-certificates
docker pull ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG}
wget https://github.com/arminc/clair-scanner/releases/download/v6/clair-scanner_linux_386
mv clair-scanner_linux_386 clair-scanner
chmod +x clair-scanner
touch clair-whitelist.yml
./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log -w clair-whitelist.yml ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG} || true
}
function codeclimate() {
cc_opts="--env CODECLIMATE_CODE="$PWD" \
......
# This is a simple gitlab continuous integration template (compatible with the shared runner provided on gitlab.com)
# using the official mono docker image to build a visual studio project.
#
# MyProject.sln
# MyProject\
# MyProject\
# MyProject.csproj (console application)
# MyProject.Test\
# MyProject.Test.csproj (test library using nuget packages "NUnit" and "NUnit.ConsoleRunner")
#
# Please find the full example project here:
# https://gitlab.com/tobiaskoch/gitlab-ci-example-mono
# see https://hub.docker.com/_/mono/
image: mono:latest
stages:
- test
- deploy
before_script:
- nuget restore -NonInteractive
release:
stage: deploy
only:
- master
artifacts:
paths:
- build/release/MyProject.exe
script:
# The output path is relative to the position of the csproj-file
- msbuild /p:Configuration="Release" /p:Platform="Any CPU"
/p:OutputPath="./../../build/release/" "MyProject.sln"
debug:
stage: test
script:
# The output path is relative to the position of the csproj-file
- msbuild /p:Configuration="Debug" /p:Platform="Any CPU"
/p:OutputPath="./../../build/debug/" "MyProject.sln"
- mono packages/NUnit.ConsoleRunner.3.6.0/tools/nunit3-console.exe build/debug/MyProject.Test.dll
\ No newline at end of file
......@@ -20,4 +20,4 @@ image: "rust:latest"
test:cargo:
script:
- rustc --version && cargo --version # Print version info for debugging
- cargo test --verbose --jobs 1 --release # Don't parallelise to make errors more readable
- cargo test --all --verbose
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment