ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3321 from anon8675309/gitlab-ci 

Gitlab ci
This commit is contained in:
Isaac Connor 2021-08-05 13:34:05 -04:00 committed by GitHub
parent 7dc36f67db 47f171c75c
commit 45bf28a104
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.yml
View File

@ -11,6 +11,7 @@ deb:
- docker - docker
script: script:
- yes "" | ./utils/do_debian_package.sh --snapshot=stable --type=binary --interactive=no --dput=no --debbuild-extra=--no-sign || true - yes "" | ./utils/do_debian_package.sh --snapshot=stable --type=binary --interactive=no --dput=no --debbuild-extra=--no-sign || true
timeout: 2h
artifacts: artifacts:
paths: paths:
- '*.deb' - '*.deb'

2
utils/do_debian_package.sh
View File

@ -122,7 +122,7 @@ else
BRANCH=`git describe --tags $(git rev-list --tags --max-count=1)`; BRANCH=`git describe --tags $(git rev-list --tags --max-count=1)`;
if [ -z "$BRANCH" ]; then if [ -z "$BRANCH" ]; then
# This should only happen in CI environments where tag info isn't available # This should only happen in CI environments where tag info isn't available
BRANCH=`grep ' release$' distros/fedora/zoneminder.spec | head -n 1 | sed -e 's/ release//g' -e 's/[^0-9]*//'` BRANCH=`cat version`
echo "Building branch $BRANCH" echo "Building branch $BRANCH"
fi fi
if [ "$BRANCH" == "" ]; then if [ "$BRANCH" == "" ]; then