ci: line-wrap and split/join some commands

For increased readability.

Note: `>` basically turns each newline into a space while `|` keeps
newlines as is.  Both remove leading indentation.

Note2: On jobs using `apt-get install`, this commit moves package names
to their own line, to make it easier to compare which packages are being
installed across such jobs.

1 files changed, 30 insertions, 9 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fe07b5b93..bfad57c08 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,11 +5,14 @@
 # and fedora:latest for new setups
 # 3. Alpine for installing directly from source
 # Also builds apparmor package for Ubuntu LTS
+
 build_ubuntu_package:
     image: ubuntu:rolling
     script:
         - apt-get update -qq
-        - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian libapparmor-dev pkg-config python3 gawk
+        - >
+            DEBIAN_FRONTEND=noninteractive apt-get install -y -qq
+            build-essential lintian libapparmor-dev pkg-config python3 gawk
         - ./configure
         - make deb
         - dpkg -i firejail*.deb
@@ -20,7 +23,9 @@ build_debian_package:
     image: debian:stretch
     script:
         - apt-get update -qq
-        - apt-get install -y -qq build-essential lintian libapparmor-dev pkg-config gawk
+        - >
+            apt-get install -y -qq
+            build-essential lintian libapparmor-dev pkg-config gawk
         - ./configure
         - make deb
         - dpkg -i firejail*.deb
@@ -63,7 +68,9 @@ build_no_apparmor:
     image: ubuntu:latest
     script:
         - apt-get update -qq
-        - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian pkg-config gawk
+        - >
+            DEBIAN_FRONTEND=noninteractive apt-get install -y -qq
+            build-essential lintian pkg-config gawk
         - ./configure
         - make dist
         - ./mkdeb.sh --disable-apparmor
@@ -80,16 +87,30 @@ debian_ci:
         - git checkout -B ci_build $CI_COMMIT_SHA
         - gitlab-ci-enable-sid
         - gitlab-ci-enable-experimental
-        - echo "deb-src http://deb.debian.org/debian sid main" >> /etc/apt/sources.list
-        - echo "deb-src http://deb.debian.org/debian experimental main" >> /etc/apt/sources.list
+        - |
+            cat >>/etc/apt/sources.list <<EOF
+            deb-src http://deb.debian.org/debian sid main
+            deb-src http://deb.debian.org/debian experimental main
+            EOF
         - apt-get update
         - git config user.name "$DEBFULLNAME"
         - git config user.email "$DEBEMAIL"
-        - cd $CI_PROJECT_DIR/.. && (apt-get source --download-only -t experimental firejail || apt-get source --download-only firejail)
-        - cd $CI_PROJECT_DIR && tar xf ../firejail_*.debian.tar.*
+        - |
+            cd $CI_PROJECT_DIR/.. &&
+            (apt-get source --download-only -t experimental firejail ||
+            apt-get source --download-only firejail)
+        - |
+            cd $CI_PROJECT_DIR &&
+            tar xf ../firejail_*.debian.tar.*
         - rm -rf debian/patches/
-        - 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
-        - git add debian && git commit -m "add debian/"
+        - |
+            VERSION=$(grep ^PACKAGE_VERSION= configure | cut -d "'" -f 2) &&
+            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
+        - git add debian
+        - git commit -m "add debian/"
         - export CI_COMMIT_SHA=$(git rev-parse HEAD)
     script:
         - apt-get --no-install-recommends install -y -qq gawk