Skip to content
GitLab
Commit 4e580634 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Merge branch '6020-speed-up-ci' into '1.3.1-fixes' 

Resolve "Speed up CI"

See merge request fusiondirectory/fd!647
parents 110cdbf3 fab66e92
dev 6342-update-the-locales-for-1-5 6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen 6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account 6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock 6378-orcid-test-method-is-wrong-and-break-orcid-saving core-php8 master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 10 additions and 25 deletions
+10 -25
.gitlab-ci.yml
+ 10
− 25
View file @ 4e580634
...@@ -15,13 +15,10 @@ stages: ...@@ -15,13 +15,10 @@ stages:
# Perl lint # Perl lint
create_perl_lint_rapport: create_perl_lint_rapport:
image: perlcodestyle:stretch
stage: lint stage: lint
only: only:
- branches - branches
before_script:
- apt-get update -qq
- apt-get install -y -qq libarchive-extract-perl libcrypt-cbc-perl libdigest-sha-perl libfile-copy-recursive-perl
- apt-get install -y -qq libnet-ldap-perl libpath-class-perl libterm-readkey-perl libxml-twig-perl
script: script:
- perl -cW contrib/bin/fusiondirectory-setup contrib/bin/fusiondirectory-insert-schema - perl -cW contrib/bin/fusiondirectory-setup contrib/bin/fusiondirectory-insert-schema
...@@ -45,12 +42,10 @@ create_php_lint_rapport_stretch: ...@@ -45,12 +42,10 @@ create_php_lint_rapport_stretch:
# generate man pages to test validity # generate man pages to test validity
create_manpages_lint_report: create_manpages_lint_report:
image: perlcodestyle:stretch
stage: lint stage: lint
only: only:
- branches - branches
before_script:
- apt-get update -qq
- apt-get install -y -qq perl man-db
script: script:
- pod2man -c "FusionDirectory Documentation" -r "FusionDirectory 1.3" contrib/bin/fusiondirectory-insert-schema contrib/man/fusiondirectory-insert-schema.1 - pod2man -c "FusionDirectory Documentation" -r "FusionDirectory 1.3" contrib/bin/fusiondirectory-insert-schema contrib/man/fusiondirectory-insert-schema.1
- pod2man -c "FusionDirectory Documentation" -r "FusionDirectory 1.3" contrib/bin/fusiondirectory-setup contrib/man/fusiondirectory-setup.1 - pod2man -c "FusionDirectory Documentation" -r "FusionDirectory 1.3" contrib/bin/fusiondirectory-setup contrib/man/fusiondirectory-setup.1
...@@ -63,12 +58,10 @@ create_manpages_lint_report: ...@@ -63,12 +58,10 @@ create_manpages_lint_report:
# Generate perlcritic rapport # Generate perlcritic rapport
create_perlcritic_rapport: create_perlcritic_rapport:
image: perlcodestyle:stretch
stage: codestyle stage: codestyle
only: only:
- branches - branches
before_script:
- apt-get update -qq
- apt-get install -y -qq libperl-critic-perl
script: script:
- cp contrib/bin/fusiondirectory-setup contrib/bin/fusiondirectory-setup.pl - cp contrib/bin/fusiondirectory-setup contrib/bin/fusiondirectory-setup.pl
- cp contrib/bin/fusiondirectory-insert-schema contrib/bin/fusiondirectory-insert-schema.pl - cp contrib/bin/fusiondirectory-insert-schema contrib/bin/fusiondirectory-insert-schema.pl
...@@ -76,14 +69,12 @@ create_perlcritic_rapport: ...@@ -76,14 +69,12 @@ create_perlcritic_rapport:
# PHP codesniffer # PHP codesniffer
create_php_code_sniffer_rapport_13: create_php_code_sniffer_rapport_13:
image: phpcodesniffer-cli:stretch
stage: codestyle stage: codestyle
only: only:
- branches - branches
before_script:
- apt-get update -qq
- apt-get install -y -qq git php-cli php-codesniffer
script: script:
- git clone https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git -b 1.3 ../dev-tools - git clone --depth 1 https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git -b 1.3 ../dev-tools
- find . -type f -name '*.php' -o -name '*.inc' > ./filelist - find . -type f -name '*.php' -o -name '*.inc' > ./filelist
- phpcs --standard=../dev-tools/php-codesniffer-rules/FDStandard/ruleset.xml --file-list=./filelist - phpcs --standard=../dev-tools/php-codesniffer-rules/FDStandard/ruleset.xml --file-list=./filelist
...@@ -124,28 +115,22 @@ sonar_preview: ...@@ -124,28 +115,22 @@ sonar_preview:
# fusiondirectory-update-locale # fusiondirectory-update-locale
fusiondirectory-update-locale: fusiondirectory-update-locale:
image: php:cli-stretch image: transifex-cli:stretch
stage: transifex stage: transifex
only: only:
- branches - branches
before_script:
- apt-get update -qq
- apt-get install -y -qq gettext git
script: script:
- git clone https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git ../dev-tools - git clone --depth 1 https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git ../dev-tools
- ../dev-tools/locale-scripts/fusiondirectory-update-locale -g - ../dev-tools/locale-scripts/fusiondirectory-update-locale -g
# Update transifex # Update transifex
update-transifex: update-transifex:
image: php:cli-stretch image: transifex-cli:stretch
stage: transifex stage: transifex
only: only:
- /^1.*$/ - /^1.*$/
before_script:
- apt-get update -qq
- apt-get install -y -qq gettext git transifex-client
script: script:
- git clone https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git ../dev-tools - git clone --depth 1 https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git ../dev-tools
- echo $'[https://www.transifex.com]\nhostname = https://www.transifex.com\nusername = '"$TRANSIFEX_USER"$'\npassword = '"$TRANSIFEX_PASSWORD"$'\ntoken = '"$TRANSIFEX_API_TOKEN"$'\n' > ~/.transifexrc - echo $'[https://www.transifex.com]\nhostname = https://www.transifex.com\nusername = '"$TRANSIFEX_USER"$'\npassword = '"$TRANSIFEX_PASSWORD"$'\ntoken = '"$TRANSIFEX_API_TOKEN"$'\n' > ~/.transifexrc
- tx pull -a -f - tx pull -a -f
- ../dev-tools/locale-scripts/fusiondirectory-update-locale -g - ../dev-tools/locale-scripts/fusiondirectory-update-locale -g
...@@ -172,7 +157,7 @@ build-release: ...@@ -172,7 +157,7 @@ build-release:
script: script:
- mkdir "../fusiondirectory-$(grep '%' Changelog.md | head -n1 | cut -d ' ' -f3 | tr -d '"')" - mkdir "../fusiondirectory-$(grep '%' Changelog.md | head -n1 | cut -d ' ' -f3 | tr -d '"')"
- cp -a ./* "../fusiondirectory-$(grep '%' Changelog.md | head -n1 | cut -d ' ' -f3 | tr -d '"')" - cp -a ./* "../fusiondirectory-$(grep '%' Changelog.md | head -n1 | cut -d ' ' -f3 | tr -d '"')"
- mv "../fusiondirectory-$(grep '%' Changelog.md | head -n1 | cut -d ' ' -f3 | tr -d '"')" ./ - mv "../fusiondirectory-$(grep '%' Changelog.md | head -n1 | cut -d ' ' -f3 | tr -d '"')" ./
artifacts: artifacts:
name: fusiondirectory-"$(grep '%' Changelog.md | head -n1 | cut -d ' ' -f3 | tr -d '"')" name: fusiondirectory-"$(grep '%' Changelog.md | head -n1 | cut -d ' ' -f3 | tr -d '"')"
paths: paths:
......
  • bmortier @bmortier ·
    Maintainer

    SonarQube analysis reported 1 issue

    • :arrow_down_small: 1 minor

    Note: The following issues were found on lines that were not modified in the commit. Because these issues can't be reported as line comments, they are summarized here:

    1. :arrow_down_small: Rename class "tabs_configInLdap" to match the regular expression ^[a-zA-Z][a-zA-Z0-9]*$. :blue_book:

    By Ghost User on 2019-07-25T16:11:49 (imported from GitLab)

Supports Markdown
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