From 1744198431b7abcddda01a1025a146862d0a8b4b Mon Sep 17 00:00:00 2001 From: Dani Llewellyn Date: Sun, 19 Dec 2021 17:08:02 +0000 Subject: [PATCH] Unify snapcraft.yaml indentation fixed at 2 spaces per indent level --- snap/snapcraft.yaml | 84 ++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 392c813..046e192 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -11,47 +11,47 @@ confinement: classic grade: stable apps: - jenkins: - environment: - XDG_DATA_HOME: "$SNAP/usr/share" - FONTCONFIG_PATH: "$SNAP/etc/fonts" - JAVA_HOME: "$SNAP/usr/lib/jvm/java-11-openjdk" - LD_LIBRARY_PATH: "$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET" - command: | - usr/lib/jvm/java-11-openjdk/bin/java -DJENKINS_HOME="$SNAP_DATA" -Djava.awt.headless=true -jar $SNAP/jenkins.war - daemon: simple - config: - command: jenkins-config + jenkins: + environment: + XDG_DATA_HOME: "$SNAP/usr/share" + FONTCONFIG_PATH: "$SNAP/etc/fonts" + JAVA_HOME: "$SNAP/usr/lib/jvm/java-11-openjdk" + LD_LIBRARY_PATH: "$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET" + command: | + usr/lib/jvm/java-11-openjdk/bin/java -DJENKINS_HOME="$SNAP_DATA" -Djava.awt.headless=true -jar $SNAP/jenkins.war + daemon: simple + config: + command: jenkins-config parts: - bsi-trigger: # A non-built part, only used to trigger builds in build.snapcraft.io on upstream changes - plugin: nil - source: https://github.com/jenkinsci/jenkins.git - jenkins: - plugin: nil - stage-packages: - - fonts-dejavu-core - - libfontconfig1 - - openjdk-11-jre-headless - - ca-certificates-java - build-packages: - - curl - - unzip - - libnss3 - - ca-certificates-java - override-build: | - curl -sLO http://mirrors.jenkins.io/war/latest/jenkins.war - unzip jenkins.war META-INF/MANIFEST.MF - VERSION=$(grep Jenkins-Version META-INF/MANIFEST.MF | cut -d' ' -f2 | tr -d '\r') - rm META-INF/MANIFEST.MF - mv $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-11-openjdk-* $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-11-openjdk - rm $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-11-openjdk/lib/security/cacerts - cp /etc/ssl/certs/java/cacerts $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-11-openjdk/lib/security/cacerts - cp /etc/ssl/certs/java/cacerts $SNAPCRAFT_PART_INSTALL/etc/ssl/certs/java/cacerts - mv jenkins.war $SNAPCRAFT_PART_INSTALL - snapcraftctl set-version "$VERSION" - config: - plugin: dump - source: snap/local - prime: - - jenkins-config + bsi-trigger: # A non-built part, only used to trigger builds in build.snapcraft.io on upstream changes + plugin: nil + source: https://github.com/jenkinsci/jenkins.git + jenkins: + plugin: nil + stage-packages: + - fonts-dejavu-core + - libfontconfig1 + - openjdk-11-jre-headless + - ca-certificates-java + build-packages: + - curl + - unzip + - libnss3 + - ca-certificates-java + override-build: | + curl -sLO http://mirrors.jenkins.io/war/latest/jenkins.war + unzip jenkins.war META-INF/MANIFEST.MF + VERSION=$(grep Jenkins-Version META-INF/MANIFEST.MF | cut -d' ' -f2 | tr -d '\r') + rm META-INF/MANIFEST.MF + mv $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-11-openjdk-* $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-11-openjdk + rm $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-11-openjdk/lib/security/cacerts + cp /etc/ssl/certs/java/cacerts $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-11-openjdk/lib/security/cacerts + cp /etc/ssl/certs/java/cacerts $SNAPCRAFT_PART_INSTALL/etc/ssl/certs/java/cacerts + mv jenkins.war $SNAPCRAFT_PART_INSTALL + snapcraftctl set-version "$VERSION" + config: + plugin: dump + source: snap/local + prime: + - jenkins-config