diff options
| author |  Reiner Herrmann <reiner@reiner-h.de> | 2020-01-01 20:13:37 +0100 |
|---|---|---|
| committer | Reiner Herrmann <reiner@reiner-h.de> | 2020-01-01 20:17:53 +0100 |
| commit | 2b62943a2d2605f05863c2bc368a02821d5285e6 (patch) | |
| tree | b5eb20ec578ab064612422f333f4f2c576a0cf03 /.gitlab-ci.yml | |
| parent | Fix private-lib in gedit.profile (diff) | |
| download | firejail-2b62943a2d2605f05863c2bc368a02821d5285e6.tar.gz firejail-2b62943a2d2605f05863c2bc368a02821d5285e6.tar.zst firejail-2b62943a2d2605f05863c2bc368a02821d5285e6.zip | |
gitlab-ci: drop debian patches before building, as they might conflict
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 19dd2b320..07d3b4bde 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml | |||
| @@ -74,6 +74,7 @@ debian_ci: | |||
| 74 | - git config user.email "$GITLAB_USER_NAME" && git config user.name "$GITLAB_USER_EMAIL" | 74 | - git config user.email "$GITLAB_USER_NAME" && git config user.name "$GITLAB_USER_EMAIL" |
| 75 | - cd $CI_PROJECT_DIR/.. && (apt-get source --download-only -t experimental firejail || apt-get source --download-only firejail) | 75 | - cd $CI_PROJECT_DIR/.. && (apt-get source --download-only -t experimental firejail || apt-get source --download-only firejail) |
| 76 | - cd $CI_PROJECT_DIR && tar xf ../firejail_*.debian.tar.* | 76 | - cd $CI_PROJECT_DIR && tar xf ../firejail_*.debian.tar.* |
| 77 | - rm -rf debian/patches/ | ||
| 77 | - VERSION=$(grep ^PACKAGE_VERSION= configure | cut -d"'" -f2) && dch -v ${VERSION}-0.1~ci "Non-maintainer upload." && git archive -o ../firejail_${VERSION}.orig.tar.gz HEAD && pristine-tar commit ../firejail_${VERSION}.orig.tar.gz ci_build && git branch -m pristine-tar origin/pristine-tar | 78 | - VERSION=$(grep ^PACKAGE_VERSION= configure | cut -d"'" -f2) && dch -v ${VERSION}-0.1~ci "Non-maintainer upload." && git archive -o ../firejail_${VERSION}.orig.tar.gz HEAD && pristine-tar commit ../firejail_${VERSION}.orig.tar.gz ci_build && git branch -m pristine-tar origin/pristine-tar |
| 78 | - git add debian && git commit -m "add debian/" | 79 | - git add debian && git commit -m "add debian/" |
| 79 | - export CI_COMMIT_SHA=$(git rev-parse HEAD) | 80 | - export CI_COMMIT_SHA=$(git rev-parse HEAD) |