Merge branch 'master' into master

snapcrafters · Oct 18, 2023 · ad4e9d3 · ad4e9d3
2 parents 64987c3 + ed395a5
commit ad4e9d3
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 75 deletions.
diff --git a/.github/workflows/test-snap-can-build.yml b/.github/workflows/test-snap-can-build.yml
@@ -0,0 +1,25 @@
+name: 🧪 Test snap can be built on x86_64
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: snapcore/action-build@v1
+        id: build
+
+      - uses: diddlesnaps/snapcraft-review-action@v1
+        with:
+          snap: ${{ steps.build.outputs.snap }}
+          isClassic: 'true'
+          # Plugs and Slots declarations to override default denial (requires store assertion to publish)
+          # plugs: ./plug-declaration.json
+          # slots: ./slot-declaration.json
diff --git a/.travis.yml b/.travis.yml
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -12,47 +12,45 @@ 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-17-openjdk"
-          LD_LIBRARY_PATH: "$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET"
-        command: launch            
-        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-17-openjdk"
+      LD_LIBRARY_PATH: "$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET"
+    command: launch            
+    daemon: simple
+  config:
+    command: jenkins-config
 
 parts:
-    jenkins:
-        plugin: nil
-        source: https://github.com/jenkinsci/jenkins.git # in lieu of the BGI trigger which didn't seem to work
-        stage-packages:
-            - fonts-dejavu-core
-            - libfontconfig1
-            - openjdk-17-jre-headless
-            - ca-certificates-java
-        build-packages:
-            - curl
-            - libnss3
-            - ca-certificates-java
-
-        override-pull: |
-          snapcraftctl pull
-          snapcraftctl set-version "$(git describe --tags | sed 's/^v//' | cut -d "-" -f2)"
-        
-        override-build: |
-            curl -sLO http://mirrors.jenkins.io/war/latest/jenkins.war
-            mv $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk-* $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk
-            rm $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk/lib/security/cacerts
-            cp /etc/ssl/certs/java/cacerts $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk/lib/security/cacerts
-            cp /etc/ssl/certs/java/cacerts $SNAPCRAFT_PART_INSTALL/etc/ssl/certs/java/cacerts
-            mv jenkins.war $SNAPCRAFT_PART_INSTALL
-                       
-    config:
-        plugin: dump
-        source: snap/local
-        prime:
-            - jenkins-config
-            - launch
-
+  jenkins:
+    plugin: nil
+    source: https://github.com/jenkinsci/jenkins.git # in lieu of the BGI trigger which didn't seem to work
+    stage-packages:
+      - fonts-dejavu-core
+      - libfontconfig1
+      - openjdk-17-jre-headless
+      - ca-certificates-java
+    build-packages:
+      - curl
+      - libnss3
+      - ca-certificates-java
+
+    override-pull: |
+      snapcraftctl pull
+      snapcraftctl set-version "$(git describe --tags | sed 's/^v//' | cut -d "-" -f2)"
+
+    override-build: |
+      curl -sLO http://mirrors.jenkins.io/war/latest/jenkins.war
+      mv $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk-* $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk
+      rm $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk/lib/security/cacerts
+      cp /etc/ssl/certs/java/cacerts $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk/lib/security/cacerts
+      cp /etc/ssl/certs/java/cacerts $SNAPCRAFT_PART_INSTALL/etc/ssl/certs/java/cacerts
+      mv jenkins.war $SNAPCRAFT_PART_INSTALL
+  config:
+    plugin: dump
+    source: snap/local
+    prime:
+      - jenkins-config
+      - launch