Commit 2967f8b6 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'update-gitignore-9-5' into 'master'

update gitignores and licenses

See merge request !13423
parents 845b5db6 0cb88374
...@@ -31,7 +31,7 @@ cmake-build-debug/ ...@@ -31,7 +31,7 @@ cmake-build-debug/
## Plugin-specific files: ## Plugin-specific files:
# IntelliJ # IntelliJ
/out/ out/
# mpeltonen/sbt-idea plugin # mpeltonen/sbt-idea plugin
.idea_modules/ .idea_modules/
......
...@@ -18,3 +18,4 @@ cabal.sandbox.config ...@@ -18,3 +18,4 @@ cabal.sandbox.config
.stack-work/ .stack-work/
cabal.project.local cabal.project.local
.HTF/ .HTF/
.ghc.environment.*
...@@ -7,8 +7,10 @@ config/settings.*.php ...@@ -7,8 +7,10 @@ config/settings.*.php
# The following files are generated by PrestaShop. # The following files are generated by PrestaShop.
admin-dev/autoupgrade/ admin-dev/autoupgrade/
/cache/ /cache/*
!/cache/index.php !/cache/index.php
!/cache/*/
/cache/*/*
!/cache/cachefs/index.php !/cache/cachefs/index.php
!/cache/purifier/index.php !/cache/purifier/index.php
!/cache/push/index.php !/cache/push/index.php
......
...@@ -13,6 +13,10 @@ SqueakDebug.log ...@@ -13,6 +13,10 @@ SqueakDebug.log
# Monticello package cache # Monticello package cache
/package-cache /package-cache
# playground cache
/play-cache
/play-stash
# Metacello-github cache # Metacello-github cache
/github-cache /github-cache
github-*.zip github-*.zip
...@@ -39,3 +39,6 @@ ...@@ -39,3 +39,6 @@
# Backup entities generated with doctrine:generate:entities command # Backup entities generated with doctrine:generate:entities command
**/Entity/*~ **/Entity/*~
# Embedded web-server pid file
/.web-server-pid
...@@ -151,7 +151,7 @@ publish/ ...@@ -151,7 +151,7 @@ publish/
# Publish Web Output # Publish Web Output
*.[Pp]ublish.xml *.[Pp]ublish.xml
*.azurePubxml *.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings # Note: Comment the next line if you want to checkin your web deploy settings,
# but database connection strings (with potential passwords) will be unencrypted # but database connection strings (with potential passwords) will be unencrypted
*.pubxml *.pubxml
*.publishproj *.publishproj
......
image: golang:latest image: golang:latest
variables:
# Please edit to your GitLab project
REPO_NAME: gitlab.com/namespace/project
# The problem is that to be able to use go get, one needs to put # 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 # the repository in the $GOPATH. So for example if your gitlab domain
# is mydomainperso.com, and that your repository is repos/projectname, and # is gitlab.com, and that your repository is namespace/project, and
# the default GOPATH being /go, then you'd need to have your # the default GOPATH being /go, then you'd need to have your
# repository in /go/src/mydomainperso.com/repos/projectname # repository in /go/src/gitlab.com/namespace/project
# Thus, making a symbolic link corrects this. # Thus, making a symbolic link corrects this.
before_script: before_script:
- ln -s /builds /go/src/mydomainperso.com - mkdir -p $GOPATH/src/$REPO_NAME
- cd /go/src/mydomainperso.com/repos/projectname - ln -svf $CI_PROJECT_DIR/* $GOPATH/src/$REPO_NAME
- cd $GOPATH/src/$REPO_NAME
stages: stages:
- test - test
...@@ -17,20 +22,13 @@ stages: ...@@ -17,20 +22,13 @@ stages:
format: format:
stage: test stage: test
script: script:
# Add here all the dependencies, or use glide/govendor to get - go fmt $(go list ./... | grep -v /vendor/)
# them automatically. - go vet $(go list ./... | grep -v /vendor/)
# - 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/) - go test -race $(go list ./... | grep -v /vendor/)
compile: compile:
stage: build stage: build
script: 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 - go build -race -ldflags "-extldflags '-static'" -o mybinary
artifacts: artifacts:
paths: paths:
......
# This template uses the java:8 docker image because there isn't any
# official Gradle image at this moment
#
# This is the Gradle build system for JVM applications # This is the Gradle build system for JVM applications
# https://gradle.org/ # https://gradle.org/
# https://github.com/gradle/gradle # https://github.com/gradle/gradle
image: java:8 image: gradle:alpine
# Disable the Gradle daemon for Continuous Integration servers as correctness # Disable the Gradle daemon for Continuous Integration servers as correctness
# is usually a priority over speed in CI environments. Using a fresh # is usually a priority over speed in CI environments. Using a fresh
...@@ -13,29 +10,27 @@ image: java:8 ...@@ -13,29 +10,27 @@ image: java:8
variables: variables:
GRADLE_OPTS: "-Dorg.gradle.daemon=false" GRADLE_OPTS: "-Dorg.gradle.daemon=false"
# Make the gradle wrapper executable. This essentially downloads a copy of
# Gradle to build the project with.
# https://docs.gradle.org/current/userguide/gradle_wrapper.html
# It is expected that any modern gradle project has a wrapper
before_script: before_script:
- chmod +x gradlew - export GRADLE_USER_HOME=`pwd`/.gradle
# We redirect the gradle user home using -g so that it caches the
# wrapper and dependencies.
# https://docs.gradle.org/current/userguide/gradle_command_line.html
#
# Unfortunately it also caches the build output so
# cleaning removes reminants of any cached builds.
# The assemble task actually builds the project.
# If it fails here, the tests can't run.
build: build:
stage: build stage: build
script: script: gradle --build-cache assemble
- ./gradlew -g /cache/.gradle clean assemble cache:
allow_failure: false key: "$CI_COMMIT_REF_NAME"
policy: push
paths:
- build
- .gradle
# Use the generated build output to run the tests.
test: test:
stage: test stage: test
script: script: gradle check
- ./gradlew -g /cache/.gradle check cache:
key: "$CI_COMMIT_REF_NAME"
policy: pull
paths:
- build
- .gradle
...@@ -34,6 +34,10 @@ before_script: ...@@ -34,6 +34,10 @@ before_script:
# Install php extensions # Install php extensions
- docker-php-ext-install mbstring mcrypt pdo_mysql curl json intl gd xml zip bz2 opcache - docker-php-ext-install mbstring mcrypt pdo_mysql curl json intl gd xml zip bz2 opcache
# Install & enable Xdebug for code coverage reports
- pecl install xdebug
- docker-php-ext-enable xdebug
# Install Composer and project dependencies. # Install Composer and project dependencies.
- curl -sS https://getcomposer.org/installer | php - curl -sS https://getcomposer.org/installer | php
- php composer.phar install - php composer.phar install
......
...@@ -11,6 +11,9 @@ before_script: ...@@ -11,6 +11,9 @@ before_script:
- apt-get install -yqq git libmcrypt-dev libpq-dev libcurl4-gnutls-dev libicu-dev libvpx-dev libjpeg-dev libpng-dev libxpm-dev zlib1g-dev libfreetype6-dev libxml2-dev libexpat1-dev libbz2-dev libgmp3-dev libldap2-dev unixodbc-dev libsqlite3-dev libaspell-dev libsnmp-dev libpcre3-dev libtidy-dev - apt-get install -yqq git libmcrypt-dev libpq-dev libcurl4-gnutls-dev libicu-dev libvpx-dev libjpeg-dev libpng-dev libxpm-dev zlib1g-dev libfreetype6-dev libxml2-dev libexpat1-dev libbz2-dev libgmp3-dev libldap2-dev unixodbc-dev libsqlite3-dev libaspell-dev libsnmp-dev libpcre3-dev libtidy-dev
# Install PHP extensions # Install PHP extensions
- docker-php-ext-install mbstring mcrypt pdo_pgsql curl json intl gd xml zip bz2 opcache - docker-php-ext-install mbstring mcrypt pdo_pgsql curl json intl gd xml zip bz2 opcache
# Install & enable Xdebug for code coverage reports
- pecl install xdebug
- docker-php-ext-enable xdebug
# Install and run Composer # Install and run Composer
- curl -sS https://getcomposer.org/installer | php - curl -sS https://getcomposer.org/installer | php
- php composer.phar install - php composer.phar install
......
# Official language image. Look for the different tagged releases at: # Official language image. Look for the different tagged releases at:
# https://hub.docker.com/r/library/ruby/tags/ # https://hub.docker.com/r/library/ruby/tags/
image: "ruby:2.3" image: "ruby:2.4"
# 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.
...@@ -40,9 +40,9 @@ rails: ...@@ -40,9 +40,9 @@ rails:
variables: variables:
DATABASE_URL: "postgresql://postgres:postgres@postgres:5432/$POSTGRES_DB" DATABASE_URL: "postgresql://postgres:postgres@postgres:5432/$POSTGRES_DB"
script: script:
- bundle exec rake db:migrate - rails db:migrate
- bundle exec rake db:seed - rails db:seed
- bundle exec rake test - rails test
# This deploy job uses a simple deploy flow to Heroku, other providers, e.g. AWS Elastic Beanstalk # This deploy job uses a simple deploy flow to Heroku, other providers, e.g. AWS Elastic Beanstalk
# are supported too: https://github.com/travis-ci/dpl # are supported too: https://github.com/travis-ci/dpl
......
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