From 2ff5adfc4c71a6031fab4d2c25df1724b41aa502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?= Date: Tue, 11 Apr 2023 09:33:20 +0000 Subject: [PATCH] Merge the current 1.3 in master --- .gitlab-ci-files/deploy.yml | 7 ++++--- CHANGELOG.md | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci-files/deploy.yml b/.gitlab-ci-files/deploy.yml index c4f71ff..3bcd76b 100644 --- a/.gitlab-ci-files/deploy.yml +++ b/.gitlab-ci-files/deploy.yml @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index b16d4d0..aacddb0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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