Commit c527fa5c authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'release-2.1.6'

parents db06647b 42b62d07
Loading
Loading
Loading
Loading
Loading
+15 −72
Original line number Diff line number Diff line
image: localhost:5000/unicaen-dev-php7.0-apache
image: localhost:5000/unicaen-dev-php7.3-apache

stages:
  - test
  - build
  - deploy

before_script:
  ##
  ## Install ssh-agent if not already installed, it is required by Docker.
  ## (change apt-get to yum if you use an RPM-based image)
  ##
  - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'

  ##
  ## Run ssh-agent (inside the build environment)
  ##
  - eval $(ssh-agent -s)

  ##
  ## Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
  ## We're using tr to fix line endings which makes ed25519 keys work
  ## without extra base64 encoding.
  ## https://gitlab.com/gitlab-examples/ssh-private-key/issues/1#note_48526556
  ##
  - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null

  ##
  ## Create the SSH directory and give it the right permissions
  ##
  - mkdir -p ~/.ssh
  - chmod 700 ~/.ssh

  ##
  ## Optionally, if you will be using any Git commands, set the user name and
  ## and email.
  ##
  #- git config --global user.email "user@example.com"
  #- git config --global user.name "User name"
   
test:
  stage: test
  script: echo "Running tests"
  only:
  - master

build:
  stage: build
  script: echo "Building the app"
  only:
  - master

deploy_preprod:
  stage: deploy
  script:
    - echo "Host usygalpp1.unr-runn.fr" > ~/.ssh/config
    - echo "  ProxyCommand ssh -4 -W %h:%p gauthieb@ssh.unr-runn.fr 2> /dev/null" >> ~/.ssh/config
    - git push root@usygalpp1.unr-runn.fr:/var/www/sygal.git master
  when: manual
  only:
  - master

deploy_prod:
  stage: deploy
  script:
    - echo "Deploy to production server"
  environment:
    name: production
    url: https://example.com
  when: manual
  only:
  - master
  - release

release_job:
  stage: release
  image: registry.gitlab.com/gitlab-org/release-cli:latest
  rules:
    - if: $CI_COMMIT_TAG  # Run this job when a tag is created manually
  script: echo "Creation de la release $CI_COMMIT_TAG..."
  release:
    name: '$CI_COMMIT_TAG'
    tag_name: '$CI_COMMIT_TAG'
    ref: '$CI_COMMIT_TAG'
    description: 'Cf. [CHANGELOG](CHANGELOG.md) et [Release notes](doc/release-notes/v$CI_COMMIT_TAG.md)'
+16 −0
Original line number Diff line number Diff line
Journal des modifications
=========================

2.1.6
-----
- Utilisation de l'id permanent CHARTE_DEPOT_DIFFUSION_THESE pour télécharger la charte de dépôt et diffusion de thèse.
- Abandon de la nature de fichier 'divers' au profit de 'commun'.
- Rétablissement de l'import des origines de financement pour être en phase avec les releases du web service d'import.
- Financement : masquage possible de certaines origines de financement (ex : handicap).
- Financement : la visibilité des origines masquées peut être forcée grâce à un privilège.
- Interdiction de supprimer un fichier possédant un id permanent.
- Modification du document de soutenance pour signature du président pour faire figurer : numero étudiant, nouveau titre et les rôles
- Possibilité de saisir une intervention permetant au directeur de déclarer le président du jury en distanciel 
- Masquage possible de certaines origines de financement (ex : handicap).
- [FIX] Usurpation d'un compte local en BDD
- [FIX] Plantage de la page Assistance en cas d'authentification locale BDD
- [FIX] Injection manquante de la source SYGAL dans la création manuelle d'un utilisateur local (identifiant = adresse mail)
- [FIX] Date de soutenance et de fin de confidentialité : changement de l'élément de formulaire pour pouvoir sélectionner une année

2.1.5
-----
- Validation des corrections de thèses desormais réalisée par le président du jury (anc. directeurs de thèses).
+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@
        "guzzlehttp/guzzle":             "^6.3",
        "ramsey/uuid":                   "^3.3",
        "unicaen/app":                   "^3.1",
        "unicaen/auth":                  "^3.1",
        "unicaen/auth":                  "dev-release-3.2.0 as 3.1.2",
        "unicaen/bjy-authorize":         "^3.0",
        "unicaen/code":                  "^3.0",
        "unicaen/db-import":             "^3.1",
+15 −6
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
    "content-hash": "9a32749766400559d0b7f87218c03e2b",
    "content-hash": "a726480d5d45b634617a92d3f08be01b",
    "packages": [
        {
            "name": "beberlei/assert",
@@ -3395,11 +3395,11 @@
        },
        {
            "name": "unicaen/auth",
            "version": "3.1.2",
            "version": "dev-release-3.2.0",
            "source": {
                "type": "git",
                "url": "https://git.unicaen.fr/lib/unicaen/auth.git",
                "reference": "f20a38745c469ebe7283bf0bde194ee31728f201"
                "reference": "abb31635a31a64432731ed42dccaeaef36f30ad7"
            },
            "require": {
                "jasig/phpcas": "^1.3",
@@ -3421,7 +3421,7 @@
                ]
            },
            "description": "Module d'authentification pour les applications Unicaen",
            "time": "2021-02-09T17:17:53+00:00"
            "time": "2021-03-09T13:20:50+00:00"
        },
        {
            "name": "unicaen/bjy-authorize",
@@ -7952,9 +7952,18 @@
            "time": "2019-06-11T19:33:38+00:00"
        }
    ],
    "aliases": [],
    "aliases": [
        {
            "alias": "3.1.2",
            "alias_normalized": "3.1.2.0",
            "version": "dev-release-3.2.0",
            "package": "unicaen/auth"
        }
    ],
    "minimum-stability": "stable",
    "stability-flags": [],
    "stability-flags": {
        "unicaen/auth": 20
    },
    "prefer-stable": false,
    "prefer-lowest": false,
    "platform": {
+18 −0
Original line number Diff line number Diff line
@@ -233,6 +233,24 @@ return [
                    'intermediate_table_auto_drop' => false,
                ],
            ],
            [
                'name' => 'origine-financement',
                'source' => [
                    'name'               => 'app',
                    'table'              => 'SRC_ORIGINE_FINANCEMENT',
                    'connection'         => 'default',
                    'source_code_column' => 'SOURCE_CODE',
                ],
                'destination' => [
                    'name'               => 'app',
                    'table'              => 'ORIGINE_FINANCEMENT',
                    'connection'         => 'default',
                    'source_code_column' => 'SOURCE_CODE',
                    //'log_table' => 'import_log',
                    //'intermediate_table' => 'TMP_ORIGINE_FINANCEMENT',
                    'intermediate_table_auto_drop' => false,
                ],
            ],
            [
                'name' => 'financement',
                'source' => [
Loading