From 64f2e306d9acb179fb6aec72f60fcf770ec75bc0 Mon Sep 17 00:00:00 2001 From: Dylan Griffith Date: Wed, 26 Sep 2018 18:59:11 +0300 Subject: Update all gitlab ci templates from gitlab-org/gitlab-ci-yml Since we no longer maintain this separate repo we just needed to do one final copy from there. See https://gitlab.com/gitlab-org/gitlab-ce/issues/50289 --- lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 3 +- lib/gitlab/ci/templates/Julia.gitlab-ci.yml | 54 +++++++++++++++------- lib/gitlab/ci/templates/Pages/Jigsaw.gitlab-ci.yml | 42 +++++++++++++++++ lib/gitlab/ci/templates/Swift.gitlab-ci.yml | 2 +- 4 files changed, 82 insertions(+), 19 deletions(-) create mode 100644 lib/gitlab/ci/templates/Pages/Jigsaw.gitlab-ci.yml (limited to 'lib') diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index 33ae9c6ad7e..e3a2534e97a 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -49,7 +49,7 @@ variables: POSTGRES_DB: $CI_ENVIRONMENT_SLUG KUBERNETES_VERSION: 1.8.6 - HELM_VERSION: 2.6.1 + HELM_VERSION: 2.10.0 DOCKER_DRIVER: overlay2 @@ -605,7 +605,6 @@ rollout 100%: --set postgresql.postgresPassword="$POSTGRES_PASSWORD" \ --set postgresql.postgresDatabase="$POSTGRES_DB" \ --namespace="$KUBE_NAMESPACE" \ - --version="$CI_PIPELINE_ID-$CI_JOB_ID" \ "$name" \ chart/ diff --git a/lib/gitlab/ci/templates/Julia.gitlab-ci.yml b/lib/gitlab/ci/templates/Julia.gitlab-ci.yml index 140cb4635f3..04c21b4725d 100644 --- a/lib/gitlab/ci/templates/Julia.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Julia.gitlab-ci.yml @@ -1,4 +1,4 @@ -# An example .gitlab-ci.yml file to test (and optionally report the coverage +# This is an example .gitlab-ci.yml file to test (and optionally report the coverage # results of) your [Julia][1] packages. Please refer to the [documentation][2] # for more information about package development in Julia. # @@ -6,7 +6,7 @@ # whatever name you have given to your package. # # [1]: http://julialang.org/ -# [2]: http://julia.readthedocs.org/ +# [2]: https://docs.julialang.org/en/v1/manual/documentation/index.html # Below is the template to run your tests in Julia .test_template: &test_definition @@ -18,25 +18,30 @@ script: # Let's run the tests. Substitute `coverage = false` below, if you do not # want coverage results. - - /opt/julia/bin/julia -e 'Pkg.clone(pwd()); Pkg.test("MyPackage", - coverage = true)' + - julia -e 'using Pkg; Pkg.clone(pwd()); Pkg.build("MyPackage"); Pkg.test("MyPackage"; coverage = true)' # Comment out below if you do not want coverage results. - - /opt/julia/bin/julia -e 'Pkg.add("Coverage"); cd(Pkg.dir("MyPackage")); + - julia -e 'using Pkg; Pkg.add("Coverage"); + import MyPackage; cd(joinpath(dirname(pathof(MyPackage)), "..")); using Coverage; cl, tl = get_summary(process_folder()); println("(", cl/tl*100, "%) covered")' # Name a test and select an appropriate image. -test:0.4.6: - image: julialang/julia:v0.4.6 +# images comes from Docker hub +test:0.7: + image: julia:0.7 + <<: *test_definition + +test:1.0: + image: julia:1.0 <<: *test_definition # Maybe you would like to test your package against the development branch: -test:0.5.0-dev: - image: julialang/julia:v0.5.0-dev - # ... allowing for failures, since we are testing against the development - # branch: - allow_failure: true - <<: *test_definition +# test:1.1-dev (not sure there is such an image in docker, so not tested yet): +# image: julia:v1.1-dev +# # ... allowing for failures, since we are testing against the development +# # branch: +# allow_failure: true +# <<: *test_definition # REMARK: Do not forget to enable the coverage feature for your project, if you # are using code coverage reporting above. This can be done by @@ -44,11 +49,28 @@ test:0.5.0-dev: # - Navigating to the `CI/CD Pipelines` settings of your project, # - Copying and pasting the default `Simplecov` regex example provided, i.e., # `\(\d+.\d+\%\) covered` in the `test coverage parsing` textfield. -# -# WARNING: This template is using the `julialang/julia` images from [Docker + +# Example documentation deployment +pages: + image: julia:0.7 + stage: deploy + script: + - apt-get update -qq && apt-get install -y git # needed by Documenter + - julia -e 'using Pkg; Pkg.clone(pwd()); Pkg.build("MyPackage");' # rebuild Julia (can be put somewhere else I'm sure + - julia -e 'using Pkg; import MyPackage; Pkg.add("Documenter")' # install Documenter + - julia --color=yes docs/make.jl # make documentation + - mv docs/build public # move to the directory picked up by Gitlab pages + artifacts: + paths: + - public + only: + - master + + +# WARNING: This template is using the `julia` images from [Docker # Hub][3]. One can use custom Julia images and/or the official ones found # in the same place. However, care must be taken to correctly locate the binary # file (`/opt/julia/bin/julia` above), which is usually given on the image's # description page. # -# [3]: http://hub.docker.com/ +# [3]: https://hub.docker.com/_/julia/ diff --git a/lib/gitlab/ci/templates/Pages/Jigsaw.gitlab-ci.yml b/lib/gitlab/ci/templates/Pages/Jigsaw.gitlab-ci.yml new file mode 100644 index 00000000000..0e5fb410a4e --- /dev/null +++ b/lib/gitlab/ci/templates/Pages/Jigsaw.gitlab-ci.yml @@ -0,0 +1,42 @@ +# Jigsaw is a simple static sites generator with Laravel's Blade. +# +# Full project: https://github.com/tightenco/jigsaw + +image: php:7.2 + +# These folders are cached between builds +cache: + paths: + - vendor/ + - node_modules/ + +before_script: + # Update packages + - apt-get update -yqq + + # Install dependencies + - apt-get install -yqq gnupg zlib1g-dev libpng-dev + + # Install Node 8 + - curl -sL https://deb.nodesource.com/setup_8.x | bash - + - apt-get install -yqq nodejs + + # Install php extensions + - docker-php-ext-install zip + + # Install Composer and project dependencies. + - curl -sS https://getcomposer.org/installer | php + - php composer.phar install + + # Install Node dependencies. + - npm install + +pages: + script: + - npm run production + - mv build_production public + artifacts: + paths: + - public + only: + - master diff --git a/lib/gitlab/ci/templates/Swift.gitlab-ci.yml b/lib/gitlab/ci/templates/Swift.gitlab-ci.yml index b97bfd460f2..ba8a802ba4f 100644 --- a/lib/gitlab/ci/templates/Swift.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Swift.gitlab-ci.yml @@ -1,5 +1,5 @@ # Lifted from: https://about.gitlab.com/2016/03/10/setting-up-gitlab-ci-for-ios-projects/ -# This file assumes an own GitLab CI runner, set up on a macOS system. +# This file assumes an own GitLab CI runner, setup on a macOS system. stages: - build - archive -- cgit v1.2.3