From 63310a3f86a3288598880116db61b6e8fa5c98d4 Mon Sep 17 00:00:00 2001 From: Thom Date: Thu, 10 Nov 2022 10:48:53 +0000 Subject: [PATCH 1/2] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75301f8723..52b2aed06a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ syntax:lint: - schedules - web - merge_requests - - /^\d+\.\d+\.\d+(p\d+)?$/ + - /^\d+\.\d+\.\d+([p|b]\d+)?$/ script: - echo "Syntax checking PHP files" @@ -37,7 +37,7 @@ syntax_diff:lint: - schedules - web - merge_requests - - /^\d+\.\d+\.\d+(p\d+)?$/ + - /^\d+\.\d+\.\d+([p|b]\d+)?$/ script: - echo "Syntax checking PHP files" @@ -81,7 +81,7 @@ build:package: image: edbizarro/gitlab-ci-pipeline-php:7.2 only: refs: - - /^\d+\.\d+\.\d+(p\d+)?$/ + - /^\d+\.\d+\.\d+([p|b]\d+)?$/ - web script: @@ -96,7 +96,7 @@ build:package: - tar -tvf ISPConfig-${VER}.tar.gz - echo "Uploading file to download server" - curl -u "${DEPLOY_FTP_USER}:${DEPLOY_FTP_PASSWORD}" -T ISPConfig-${VER}.tar.gz ftp://${DEPLOY_FTP_SERVER}/web/ - - if [[ "$VER" =~ ^[0-9]+\.[0-9]+\.[0-9]+(p[0-9]+)?$ ]] ; then echo "Stable release ${VER}" ; curl -u "${DEPLOY_FTP_USER}:${DEPLOY_FTP_PASSWORD}" -T ISPConfig-${VER}.tar.gz ftp://${DEPLOY_FTP_SERVER}/web/ISPConfig-3-stable.tar.gz ; echo -n "${VER}" > ispconfig3_version.txt ; curl -u "${DEPLOY_FTP_USER}:${DEPLOY_FTP_PASSWORD}" -T ispconfig3_version.txt ftp://${DEPLOY_FTP_SERVER}/web/ ; else echo "Dev release ${VER}" ; fi + - if [[ "$VER" =~ ^[0-9]+\.[0-9]+\.[0-9]+([p|b][0-9]+)?$ ]] ; then echo "Stable release ${VER}" ; curl -u "${DEPLOY_FTP_USER}:${DEPLOY_FTP_PASSWORD}" -T ISPConfig-${VER}.tar.gz ftp://${DEPLOY_FTP_SERVER}/web/ISPConfig-3-stable.tar.gz ; echo -n "${VER}" > ispconfig3_version.txt ; curl -u "${DEPLOY_FTP_USER}:${DEPLOY_FTP_PASSWORD}" -T ispconfig3_version.txt ftp://${DEPLOY_FTP_SERVER}/web/ ; else echo "Dev release ${VER}" ; fi - rm ISPConfig-${VER}.tar.gz - echo "Download url is https://download.ispconfig.org/ISPConfig-${VER}.tar.gz" -- GitLab From 3e8c1662e3df47b80575ca8af36165ea0340efca Mon Sep 17 00:00:00 2001 From: Thom Date: Thu, 10 Nov 2022 10:51:52 +0000 Subject: [PATCH 2/2] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52b2aed06a..41890c48d4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -96,7 +96,7 @@ build:package: - tar -tvf ISPConfig-${VER}.tar.gz - echo "Uploading file to download server" - curl -u "${DEPLOY_FTP_USER}:${DEPLOY_FTP_PASSWORD}" -T ISPConfig-${VER}.tar.gz ftp://${DEPLOY_FTP_SERVER}/web/ - - if [[ "$VER" =~ ^[0-9]+\.[0-9]+\.[0-9]+([p|b][0-9]+)?$ ]] ; then echo "Stable release ${VER}" ; curl -u "${DEPLOY_FTP_USER}:${DEPLOY_FTP_PASSWORD}" -T ISPConfig-${VER}.tar.gz ftp://${DEPLOY_FTP_SERVER}/web/ISPConfig-3-stable.tar.gz ; echo -n "${VER}" > ispconfig3_version.txt ; curl -u "${DEPLOY_FTP_USER}:${DEPLOY_FTP_PASSWORD}" -T ispconfig3_version.txt ftp://${DEPLOY_FTP_SERVER}/web/ ; else echo "Dev release ${VER}" ; fi + - if [[ "$VER" =~ ^[0-9]+\.[0-9]+\.[0-9]+(p[0-9]+)?$ ]] ; then echo "Stable release ${VER}" ; curl -u "${DEPLOY_FTP_USER}:${DEPLOY_FTP_PASSWORD}" -T ISPConfig-${VER}.tar.gz ftp://${DEPLOY_FTP_SERVER}/web/ISPConfig-3-stable.tar.gz ; echo -n "${VER}" > ispconfig3_version.txt ; curl -u "${DEPLOY_FTP_USER}:${DEPLOY_FTP_PASSWORD}" -T ispconfig3_version.txt ftp://${DEPLOY_FTP_SERVER}/web/ ; else echo "Dev release ${VER}" ; fi - rm ISPConfig-${VER}.tar.gz - echo "Download url is https://download.ispconfig.org/ISPConfig-${VER}.tar.gz" -- GitLab