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
Creative Commons Legal Code
CC0 1.0 Universal CC0 1.0 Universal
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
HEREUNDER.
Statement of Purpose Statement of Purpose
The laws of most jurisdictions throughout the world automatically confer The laws of most jurisdictions throughout the world automatically confer
exclusive Copyright and Related Rights (defined below) upon the creator exclusive Copyright and Related Rights (defined below) upon the creator and
and subsequent owner(s) (each and all, an "owner") of an original work of subsequent owner(s) (each and all, an "owner") of an original work of
authorship and/or a database (each, a "Work"). authorship and/or a database (each, a "Work").
Certain owners wish to permanently relinquish those rights to a Work for Certain owners wish to permanently relinquish those rights to a Work for the
the purpose of contributing to a commons of creative, cultural and purpose of contributing to a commons of creative, cultural and scientific
scientific works ("Commons") that the public can reliably and without fear works ("Commons") that the public can reliably and without fear of later
of later claims of infringement build upon, modify, incorporate in other claims of infringement build upon, modify, incorporate in other works, reuse
works, reuse and redistribute as freely as possible in any form whatsoever and redistribute as freely as possible in any form whatsoever and for any
and for any purposes, including without limitation commercial purposes. purposes, including without limitation commercial purposes. These owners may
These owners may contribute to the Commons to promote the ideal of a free contribute to the Commons to promote the ideal of a free culture and the
culture and the further production of creative, cultural and scientific further production of creative, cultural and scientific works, or to gain
works, or to gain reputation or greater distribution for their Work in reputation or greater distribution for their Work in part through the use and
part through the use and efforts of others. efforts of others.
For these and/or other purposes and motivations, and without any For these and/or other purposes and motivations, and without any expectation
expectation of additional consideration or compensation, the person of additional consideration or compensation, the person associating CC0 with a
associating CC0 with a Work (the "Affirmer"), to the extent that he or she Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
is an owner of Copyright and Related Rights in the Work, voluntarily and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
elects to apply CC0 to the Work and publicly distribute the Work under its and publicly distribute the Work under its terms, with knowledge of his or her
terms, with knowledge of his or her Copyright and Related Rights in the Copyright and Related Rights in the Work and the meaning and intended legal
Work and the meaning and intended legal effect of CC0 on those rights. effect of CC0 on those rights.
1. Copyright and Related Rights. A Work made available under CC0 may be 1. Copyright and Related Rights. A Work made available under CC0 may be
protected by copyright and related or neighboring rights ("Copyright and protected by copyright and related or neighboring rights ("Copyright and
Related Rights"). Copyright and Related Rights include, but are not Related Rights"). Copyright and Related Rights include, but are not limited
limited to, the following: to, the following:
i. the right to reproduce, adapt, distribute, perform, display, i. the right to reproduce, adapt, distribute, perform, display, communicate,
communicate, and translate a Work; and translate a Work;
ii. moral rights retained by the original author(s) and/or performer(s);
iii. publicity and privacy rights pertaining to a person's image or ii. moral rights retained by the original author(s) and/or performer(s);
likeness depicted in a Work;
iv. rights protecting against unfair competition in regards to a Work, iii. publicity and privacy rights pertaining to a person's image or likeness
subject to the limitations in paragraph 4(a), below; depicted in a Work;
v. rights protecting the extraction, dissemination, use and reuse of data
in a Work; iv. rights protecting against unfair competition in regards to a Work,
vi. database rights (such as those arising under Directive 96/9/EC of the subject to the limitations in paragraph 4(a), below;
European Parliament and of the Council of 11 March 1996 on the legal
protection of databases, and under any national implementation v. rights protecting the extraction, dissemination, use and reuse of data in
thereof, including any amended or successor version of such a Work;
directive); and
vii. other similar, equivalent or corresponding rights throughout the vi. database rights (such as those arising under Directive 96/9/EC of the
world based on applicable law or treaty, and any national European Parliament and of the Council of 11 March 1996 on the legal
implementations thereof. protection of databases, and under any national implementation thereof,
including any amended or successor version of such directive); and
2. Waiver. To the greatest extent permitted by, but not in contravention
of, applicable law, Affirmer hereby overtly, fully, permanently, vii. other similar, equivalent or corresponding rights throughout the world
irrevocably and unconditionally waives, abandons, and surrenders all of based on applicable law or treaty, and any national implementations thereof.
Affirmer's Copyright and Related Rights and associated claims and causes
of action, whether now known or unknown (including existing as well as 2. Waiver. To the greatest extent permitted by, but not in contravention of,
future claims and causes of action), in the Work (i) in all territories applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
worldwide, (ii) for the maximum duration provided by applicable law or unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
treaty (including future time extensions), (iii) in any current or future and Related Rights and associated claims and causes of action, whether now
medium and for any number of copies, and (iv) for any purpose whatsoever, known or unknown (including existing as well as future claims and causes of
including without limitation commercial, advertising or promotional action), in the Work (i) in all territories worldwide, (ii) for the maximum
purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each duration provided by applicable law or treaty (including future time
member of the public at large and to the detriment of Affirmer's heirs and extensions), (iii) in any current or future medium and for any number of
successors, fully intending that such Waiver shall not be subject to copies, and (iv) for any purpose whatsoever, including without limitation
revocation, rescission, cancellation, termination, or any other legal or commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes
equitable action to disrupt the quiet enjoyment of the Work by the public the Waiver for the benefit of each member of the public at large and to the
as contemplated by Affirmer's express Statement of Purpose. detriment of Affirmer's heirs and successors, fully intending that such Waiver
shall not be subject to revocation, rescission, cancellation, termination, or
3. Public License Fallback. Should any part of the Waiver for any reason any other legal or equitable action to disrupt the quiet enjoyment of the Work
be judged legally invalid or ineffective under applicable law, then the by the public as contemplated by Affirmer's express Statement of Purpose.
Waiver shall be preserved to the maximum extent permitted taking into
account Affirmer's express Statement of Purpose. In addition, to the 3. Public License Fallback. Should any part of the Waiver for any reason be
extent the Waiver is so judged Affirmer hereby grants to each affected judged legally invalid or ineffective under applicable law, then the Waiver
person a royalty-free, non transferable, non sublicensable, non exclusive, shall be preserved to the maximum extent permitted taking into account
irrevocable and unconditional license to exercise Affirmer's Copyright and Affirmer's express Statement of Purpose. In addition, to the extent the Waiver
Related Rights in the Work (i) in all territories worldwide, (ii) for the is so judged Affirmer hereby grants to each affected person a royalty-free,
maximum duration provided by applicable law or treaty (including future non transferable, non sublicensable, non exclusive, irrevocable and
time extensions), (iii) in any current or future medium and for any number unconditional license to exercise Affirmer's Copyright and Related Rights in
of copies, and (iv) for any purpose whatsoever, including without the Work (i) in all territories worldwide, (ii) for the maximum duration
limitation commercial, advertising or promotional purposes (the provided by applicable law or treaty (including future time extensions), (iii)
"License"). The License shall be deemed effective as of the date CC0 was in any current or future medium and for any number of copies, and (iv) for any
applied by Affirmer to the Work. Should any part of the License for any purpose whatsoever, including without limitation commercial, advertising or
reason be judged legally invalid or ineffective under applicable law, such promotional purposes (the "License"). The License shall be deemed effective as
partial invalidity or ineffectiveness shall not invalidate the remainder of the date CC0 was applied by Affirmer to the Work. Should any part of the
of the License, and in such case Affirmer hereby affirms that he or she License for any reason be judged legally invalid or ineffective under
will not (i) exercise any of his or her remaining Copyright and Related applicable law, such partial invalidity or ineffectiveness shall not
Rights in the Work or (ii) assert any associated claims and causes of invalidate the remainder of the License, and in such case Affirmer hereby
action with respect to the Work, in either case contrary to Affirmer's affirms that he or she will not (i) exercise any of his or her remaining
express Statement of Purpose. Copyright and Related Rights in the Work or (ii) assert any associated claims
and causes of action with respect to the Work, in either case contrary to
Affirmer's express Statement of Purpose.
4. Limitations and Disclaimers. 4. Limitations and Disclaimers.
a. No trademark or patent rights held by Affirmer are waived, abandoned, a. No trademark or patent rights held by Affirmer are waived, abandoned,
surrendered, licensed or otherwise affected by this document. surrendered, licensed or otherwise affected by this document.
b. Affirmer offers the Work as-is and makes no representations or
warranties of any kind concerning the Work, express, implied, b. Affirmer offers the Work as-is and makes no representations or warranties
statutory or otherwise, including without limitation warranties of of any kind concerning the Work, express, implied, statutory or otherwise,
title, merchantability, fitness for a particular purpose, non including without limitation warranties of title, merchantability, fitness
infringement, or the absence of latent or other defects, accuracy, or for a particular purpose, non infringement, or the absence of latent or
the present or absence of errors, whether or not discoverable, all to other defects, accuracy, or the present or absence of errors, whether or not
the greatest extent permissible under applicable law. discoverable, all to the greatest extent permissible under applicable law.
c. Affirmer disclaims responsibility for clearing rights of other persons
that may apply to the Work or any use thereof, including without c. Affirmer disclaims responsibility for clearing rights of other persons
limitation any person's Copyright and Related Rights in the Work. that may apply to the Work or any use thereof, including without limitation
Further, Affirmer disclaims responsibility for obtaining any necessary any person's Copyright and Related Rights in the Work. Further, Affirmer
consents, permissions or other rights required for any use of the disclaims responsibility for obtaining any necessary consents, permissions
Work. or other rights required for any use of the Work.
d. Affirmer understands and acknowledges that Creative Commons is not a
party to this document and has no duty or obligation with respect to d. Affirmer understands and acknowledges that Creative Commons is not a
this CC0 or use of the Work. party to this document and has no duty or obligation with respect to this
CC0 or use of the Work.
For more information, please see
<http://creativecommons.org/publicdomain/zero/1.0/>
...@@ -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