flatpak again

.concourse/ci.yml

@@ -2,7 +2,7 @@ resource_types:
 - name: pull-request
   type: registry-image
   source:
-    repository: jtarchie/pr
+    repository: docker.io/teliaoss/github-pr-resource
 
 - name: copr
   type: registry-image
@@ -58,7 +58,7 @@ resources:
   type: pull-request
   icon: github
   source:
-    repo: drahnr/oregano
+    repository: drahnr/oregano
     access_token: ((sirmergealot-github-token))
 
 
@@ -258,60 +258,128 @@ jobs:
     build_logs_to_retain: 20
     public: true
     plan:
+    - get: tree
+      resource: git-pull-request-resource
+      trigger: true
+
+    - put: git-pull-request-resource
+      params:
+        path: tree
+        context: compile
+        status: pending
+
     - in_parallel:
-      - get: tree
-        resource: git-pull-request-resource
-        trigger: true
       - get: oregano-test-ubuntu
         trigger: true
       - get: oregano-test-fedora
         trigger: true
 
+    - task: compile
+      timeout: 5m
+      image: oregano-test-fedora
+      config:
+        platform: linux
+        inputs:
+        - name: tree
+        run:
+          path: sh
+          args:
+          - -exc
+          - |
+            ./waf configure build --debug --prefix=/tmp install
+            ./build/test/microtests
+          dir: tree
+
+      on_success:
+        put: git-pull-request-resource
+        params:
+          path: tree
+          context: compile
+          status: success
+
+      on_failure:
+        put: git-pull-request-resource
+        params:
+          path: tree
+          context: compile
+          status: failure
+
     - in_parallel:
-      - task: compile
-        timeout: 5m
-        image: oregano-test-fedora
-        config:
-          platform: linux
-          inputs:
-          - name: tree
-          run:
-            path: sh
-            args:
-            - -exc
-            - |
-              ./waf configure build --debug --prefix=/tmp install
-              ./build/test/microtests
-            dir: tree
+      - put: git-pull-request-resource
+        params:
+          path: tree
+          context: pkg-rpm
+          status: pending
+
+      - put: git-pull-request-resource
+        params:
+          path: tree
+          context: pkg-deb
+          status: pending
 
+      - put: git-pull-request-resource
+        params:
+          path: tree
+          context: pkg-flatpak
+          status: pending
+
+    - in_parallel:
       - task: create-rpm
         timeout: 15m
         image: oregano-test-fedora
         file: tree/.concourse/tasks/pkg-rpm.yml
 
+        on_success:
+          put: git-pull-request-resource
+          params:
+            path: tree
+            context: pkg-rpm
+            status: success
+
+        on_failure:
+          put: git-pull-request-resource
+          params:
+            path: tree
+            context: pkg-rpm
+            status: failure
+
       - task: create-deb
         timeout: 15m
         image: oregano-test-ubuntu
         file: tree/.concourse/tasks/pkg-deb.yml
 
+        on_success:
+          put: git-pull-request-resource
+          params:
+            path: tree
+            context: pkg-deb
+            status: success
+
+        on_failure:
+          put: git-pull-request-resource
+          params:
+            path: tree
+            context: pkg-deb
+            status: failure
+
       - task: create-flatpak
         timeout: 35m
         image: oregano-test-fedora
         file: tree/.concourse/tasks/flatpak.yml
 
-      on_success:
-        put: git-pull-request-resource
-        params:
-          path: git-pull-request-resource
-          status: success
-
-      on_failure:
-        put: git-pull-request-resource
-        params:
-          path: git-pull-request-resource
-          status: failure
-
-
+        on_success:
+          put: git-pull-request-resource
+          params:
+            path: tree
+            context: pkg-flatpak
+            status: success
+
+        on_failure:
+          put: git-pull-request-resource
+          params:
+            path: tree
+            context: pkg-flatpak
+            status: failure
 
 
 

.concourse/tasks/flatpak.yml

@@ -21,6 +21,7 @@ run:
       --install \
       --user \
       --force-clean \
+      --disable-rofiles-fuse \
       --default-branch=$FP_BRANCH \
       --state-dir=$FPB_WRKDIR/flatpak-builder \
       --repo=$FPB_WRKDIR/flatpak-repo \

flatpak/com.github.drahnr.oregano.yaml

@@ -66,9 +66,10 @@ modules:
       - --enable-oldapps
       - --enable-openmp
     sources:
-      - type: archive
-        url: https://sourceforge.net/projects/ngspice/files/ng-spice-rework/33/ngspice-33.tar.gz
-        sha256: b99db66cc1c57c44e9af1ef6ccb1dcbc8ae1df3e35acf570af578f606f8541f1
+      - type: git
+        url: git://git.code.sf.net/p/ngspice/ngspice.git
+        tag: ngspice-32.2
+        commit: 5c3e2b6526b22015ddec692450f5c5077efa1d80
     cleanup:
       - /share/man
     modules: