From c9d7ab4e04235cb2a0c872b31b14b581b2c3b0a4 Mon Sep 17 00:00:00 2001
From: Gary Kramlich <grim@reaperworld.com>
Date: Sat, 8 Jan 2022 15:22:11 -0600
Subject: Fix the appimage build

This required some tweaks in the image which I already pushed, but these
changes make it work with both convey 0.13 and 0.15-dev

Testing Done:
Build on my dev machine with convey 0.15-dev and on one of the build agents with convey 0.13

I did also run the appimage and verify that it does in fact work!

Reviewed at https://reviews.imfreedom.org/r/1194/
---
 convey.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'convey.yaml')

diff --git a/convey.yaml b/convey.yaml
index c05ce16997..de1f6dc223 100644
--- a/convey.yaml
+++ b/convey.yaml
@@ -53,17 +53,18 @@ tasks:
     type: docker/export
     files: build-${TARGET}:${TARGET}
 
+  bare-export:
+    type: docker/export
+    files: ${TARGET}:${TARGET}
+
 plans:
   pidgin3-appimage-x86_64:
     environment:
       - TARGET=appimage-x86_64
-      - BUILD_NUMBER=0
-      - COMMIT_SHORT=${HG_COMMIT_SHORT}
-      - VERSION=${BUILD_NUMBER}~${COMMIT_SHORT}
       - RECIPE=Pidgin3
       - CONFIGURE_ARGS=-Dconsoleui=False
     stages:
-      - tasks: [import, build, export]
+      - tasks: [import, build, bare-export]
 
   clang:
     environment: [TARGET=clang]
-- 
cgit v1.2.1