Commit 3ac3106e authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'update-templates-8-14' into 'master'

Add and update .gitignore & .gitlab-ci.yml templates for 8.14

Following https://gitlab.com/gitlab-org/gitlab-ce/issues/24134

See merge request !7272
parents 492ef142 38df702b
...@@ -39,3 +39,6 @@ captures/ ...@@ -39,3 +39,6 @@ captures/
# Keystore files # Keystore files
*.jks *.jks
# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
...@@ -7,6 +7,11 @@ ...@@ -7,6 +7,11 @@
*.obj *.obj
*.elf *.elf
# Linker output
*.ilk
*.map
*.exp
# Precompiled Headers # Precompiled Headers
*.gch *.gch
*.pch *.pch
...@@ -34,3 +39,13 @@ ...@@ -34,3 +39,13 @@
# Debug files # Debug files
*.dSYM/ *.dSYM/
*.su *.su
*.idb
*.pdb
# Kernel Module Compile Results
*.mod*
*.cmd
modules.order
Module.symvers
Mkfile.old
dkms.conf
.architect .architect
bootstrap.css
bootstrap.js
bootstrap.json bootstrap.json
bootstrap.jsonp
build/ build/
classic.json
classic.jsonp
ext/ ext/
modern.json
modern.jsonp
resources/sass/.sass-cache/
...@@ -4,9 +4,6 @@ ...@@ -4,9 +4,6 @@
# User-specific stuff: # User-specific stuff:
.idea/workspace.xml .idea/workspace.xml
.idea/tasks.xml .idea/tasks.xml
.idea/dictionaries
.idea/vcs.xml
.idea/jsLibraryMappings.xml
# Sensitive or high-churn files: # Sensitive or high-churn files:
.idea/dataSources.ids .idea/dataSources.ids
......
*.DS_Store *.DS_Store
.AppleDouble .AppleDouble
.LSOverride .LSOverride
# Icon must end with two \r # Icon must end with two \r
Icon Icon
# Thumbnails # Thumbnails
._* ._*
# Files that might appear in the root of a volume # Files that might appear in the root of a volume
.DocumentRevisions-V100 .DocumentRevisions-V100
.fseventsd .fseventsd
.Spotlight-V100 .Spotlight-V100
.TemporaryItems .TemporaryItems
.Trashes .Trashes
.VolumeIcon.icns .VolumeIcon.icns
.com.apple.timemachine.donotpresent .com.apple.timemachine.donotpresent
# Directories potentially created on remote AFP share # Directories potentially created on remote AFP share
.AppleDB .AppleDB
.AppleDesktop .AppleDesktop
Network Trash Folder Network Trash Folder
Temporary Items Temporary Items
.apdisk .apdisk
This diff is collapsed.
...@@ -7,6 +7,7 @@ app/storage/ ...@@ -7,6 +7,7 @@ app/storage/
# Laravel 5 & Lumen specific # Laravel 5 & Lumen specific
bootstrap/cache/ bootstrap/cache/
public/storage
.env.*.php .env.*.php
.env.php .env.php
.env .env
......
# For projects using nanoc (http://nanoc.ws/) # For projects using Nanoc (http://nanoc.ws/)
# Default location for output, needs to match output_dir's value found in config.yaml # Default location for output (needs to match output_dir's value found in nanoc.yaml)
output/ output/
# Temporary file directory # Temporary file directory
......
...@@ -11,3 +11,10 @@ system/cache/ ...@@ -11,3 +11,10 @@ system/cache/
system/logs/ system/logs/
system/storage/ system/storage/
# vQmod log files
vqmod/logs/*
# vQmod cache files
vqmod/vqcache/*
vqmod/checked.cache
vqmod/mods.cache
...@@ -66,7 +66,7 @@ docs/_build/ ...@@ -66,7 +66,7 @@ docs/_build/
# PyBuilder # PyBuilder
target/ target/
# IPython Notebook # Jupyter Notebook
.ipynb_checkpoints .ipynb_checkpoints
# pyenv # pyenv
......
...@@ -5,3 +5,6 @@ ...@@ -5,3 +5,6 @@
# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here http://doc.crates.io/guide.html#cargotoml-vs-cargolock # More information here http://doc.crates.io/guide.html#cargotoml-vs-cargolock
Cargo.lock Cargo.lock
# These are backup files generated by rustfmt
**/*.rs.bk
...@@ -61,6 +61,15 @@ acs-*.bib ...@@ -61,6 +61,15 @@ acs-*.bib
# fixme # fixme
*.lox *.lox
# feynmf/feynmp
*.mf
*.mp
*.t[1-9]
*.t[1-9][0-9]
*.tfm
*.[1-9]
*.[1-9][0-9]
#(r)(e)ledmac/(r)(e)ledpar #(r)(e)ledmac/(r)(e)ledpar
*.end *.end
*.?end *.?end
......
# Visual Studio 2015 user specific files # Visual Studio 2015 user specific files
.vs/ .vs/
# Visual Studio 2015 database file
*.VC.db
# Compiled Object files # Compiled Object files
*.slo *.slo
*.lo *.lo
......
## Ignore Visual Studio temporary files, build results, and ## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons. ## files generated by popular Visual Studio add-ons.
##
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
# User-specific files # User-specific files
*.suo *.suo
*.user *.user
*.userosscache *.userosscache
*.sln.docstates *.sln.docstates
*.vcxproj.filters
# User-specific files (MonoDevelop/Xamarin Studio) # User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs *.userprefs
...@@ -44,6 +47,7 @@ dlldata.c ...@@ -44,6 +47,7 @@ dlldata.c
project.lock.json project.lock.json
project.fragment.lock.json project.fragment.lock.json
artifacts/ artifacts/
Properties/launchSettings.json
*_i.c *_i.c
*_p.c *_p.c
...@@ -238,6 +242,9 @@ FakesAssemblies/ ...@@ -238,6 +242,9 @@ FakesAssemblies/
# Visual Studio 6 workspace options file # Visual Studio 6 workspace options file
*.opt *.opt
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
*.vbw
# Visual Studio LightSwitch build output # Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts **/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts **/*.DesktopClient/GeneratedArtifacts
......
# Based on openjdk:8, already includes lein
image: clojure:lein-2.7.0
# If you need to configure a database, add a `services` section here
# See https://docs.gitlab.com/ce/ci/services/postgres.html
# Make sure you configure the connection as well
before_script:
# If you need to install any external applications, like a
# postgres client, you may want to uncomment the line below:
#
#- apt-get update -y
#
# Retrieve project dependencies
# Do this on before_script since it'll be shared between both test and
# any production sections a user adds
- lein deps
test:
script:
# If you need to run any migrations or configure the database, this
# would be the point to do it.
- lein test
# This file is a template, and might need editing before it works on your project.
# Official language image. Look for the different tagged releases at:
# https://hub.docker.com/r/crystallang/crystal/
image: "crystallang/crystal:latest"
# Pick zero or more services to be used on all builds.
# Only needed when using a docker container to run your tests in.
# Check out: http://docs.gitlab.com/ce/ci/docker/using_docker_images.html#what-is-service
# services:
# - mysql:latest
# - redis:latest
# - postgres:latest
# variables:
# POSTGRES_DB: database_name
# Cache shards in between builds
cache:
paths:
- libs
# This is a basic example for a shard or script which doesn't use
# services such as redis or postgres
before_script:
- apt-get update -qq && apt-get install -y -qq libxml2-dev
- crystal -v # Print out Crystal version for debugging
- shards
# If you are using built-in Crystal Spec.
spec:
script:
- crystal spec
# If you are using minitest.cr
minitest:
script:
- crystal test/spec_test.cr # change to the file(s) you execute for tests
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