Skip to content

Commit 8eed1da

Browse files
author
Marius Burkard
committed
- allow patch version in release scripts
1 parent df99cfd commit 8eed1da

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

.gitlab-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ syntax:lint:
1717
- schedules
1818
- web
1919
- merge_requests
20-
- /^\d+\.\d+\.\d+$/
20+
- /^\d+\.\d+\.\d+(p\d+)?$/
2121

2222
script:
2323
- echo "Syntax checking PHP files"
@@ -37,7 +37,7 @@ syntax_diff:lint:
3737
- schedules
3838
- web
3939
- merge_requests
40-
- /^\d+\.\d+\.\d+$/
40+
- /^\d+\.\d+\.\d+(p\d+)?$/
4141

4242
script:
4343
- echo "Syntax checking PHP files"
@@ -81,7 +81,7 @@ build:package:
8181
image: edbizarro/gitlab-ci-pipeline-php:7.2
8282
only:
8383
refs:
84-
- /^\d+\.\d+\.\d+$/
84+
- /^\d+\.\d+\.\d+(p\d+)?$/
8585
- web
8686

8787
script:
@@ -96,7 +96,7 @@ build:package:
9696
- tar -tvf ISPConfig-${VER}.tar.gz
9797
- echo "Uploading file to download server"
9898
- curl -u "${DEPLOY_FTP_USER}:${DEPLOY_FTP_PASSWORD}" -T ISPConfig-${VER}.tar.gz ftp://${DEPLOY_FTP_SERVER}/web/
99-
- if [[ "$VER" =~ ^[0-9]+\.[0-9]+\.[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
99+
- 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
100100
- rm ISPConfig-${VER}.tar.gz
101101
- echo "Download url is https://download.ispconfig.org/ISPConfig-${VER}.tar.gz"
102102

0 commit comments

Comments
 (0)