mirror of
https://gitlab.linphone.org/BC/public/flexisip-account-manager.git
synced 2026-01-17 01:58:07 +00:00
Merge the current 1.3 in master
This commit is contained in:
parent
6829167bfa
commit
2ff5adfc4c
2 changed files with 5 additions and 3 deletions
|
|
@ -28,11 +28,12 @@ remi-deploy:
|
|||
stage: deploy
|
||||
tags: ["docker"]
|
||||
only:
|
||||
refs:
|
||||
- master
|
||||
- master
|
||||
- /^release/.*$/
|
||||
|
||||
before_script:
|
||||
- rm -f $CI_PROJECT_DIR/build/*devel*.rpm
|
||||
- rm -f $CI_PROJECT_DIR/build/*devel*.rpm # Remove devel packages
|
||||
- cd $CI_PROJECT_DIR/build/ && for file in *; do mv "$file" $(echo "$file" | sed -e 's/[^A-Za-z0-9._-]//g'); done || true && cd .. # Rename non standard packages
|
||||
- eval $(ssh-agent -s)
|
||||
- echo "$DEPLOY_USER_KEY" | tr -d '\r' | ssh-add - > /dev/null
|
||||
- mkdir -p ~/.ssh && chmod 700 ~/.ssh
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
v1.3
|
||||
----
|
||||
- Fix #90 Deploy packages from release branches as well
|
||||
- Fix #58 Fix the packaging process to use git describe as a reference
|
||||
- Fix #58 Move the generated packages in the build directory, and fix the release and version format in the .spec
|
||||
- Fix #58 Refactor and cleanup the .gitlab-ci file
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue