diff options
| author | Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at> | 2020-12-09 16:57:08 +0100 |
|---|---|---|
| committer | Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at> | 2020-12-09 16:57:08 +0100 |
| commit | bdb5745f0493d45480cb780eea43acffc63d4afa (patch) | |
| tree | ac66839e46f7935a3869a4c5cfe9e1fac94ec598 | |
| parent | 7f9fe83263c3ebe13861439e9a5949470004907d (diff) | |
| download | xfce4-dev-tools-bdb5745f0493d45480cb780eea43acffc63d4afa.tar.gz | |
helpers: Prefer xfce-build over xfce-test (Fixes #38)
The xfce-build container is smaller and also what we use in GitLab CI.
| -rwxr-xr-x | helpers/xfce-do-release | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/helpers/xfce-do-release b/helpers/xfce-do-release index 1b1e1d8..b350351 100755 --- a/helpers/xfce-do-release +++ b/helpers/xfce-do-release @@ -28,7 +28,10 @@ sanity_checks () { git status --untracked-files=no -s read -n 1 -s -p "Do you really want to continue?" fi - if ! which xfce-test >/dev/null; then + if which xfce-build >/dev/null; then + export TAG="xfce-build" + echo "Working with the 'xfce-build' script and container." + elif ! which xfce-test >/dev/null; then echo "INFO: please install xfce-test to support building in a clean environment. See https://github.com/schuellerf/xfce-test" else images=$(docker images|grep -Po "(?<=^schuellerf/xfce-test) +[^ ]+"|tr -d ' ') @@ -188,9 +191,13 @@ run_steps () { edit NEWS step "Build the tarball \e[0m(./autogen.sh && make distcheck)" - # either in xfce-test container or on the local machine + # either in the xfce-build or xfce-test container or on the local machine if [ -n "$TAG" ]; then - run_command "xfce-test call ./autogen.sh" "xfce-test call make distcheck" + if [[ "$TAG" == "xfce-build" ]]; then + run_command "xfce-build" + else + run_command "xfce-test call ./autogen.sh" "xfce-test call make distcheck" + fi else run_command "./autogen.sh" "make distcheck" fi |