From efcb8312e31b5c2261b1a1e95ace55b322cfcc27 Mon Sep 17 00:00:00 2001
From: Ruben Pollan <meskio@sindominio.net>
Date: Tue, 15 Jan 2019 18:08:24 +0100
Subject: [test] update snap CI generation to the new snap

---
 .gitlab-ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7a39e59..0ed4958 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,6 +57,8 @@ win_installer:
 snap:
  image: 0xacab.org:4567/leap/docker/bitmask-systray:latest
  stage: build
+ variables:
+     GOPATH: /go/
  script:
    - mkdir -p /go/src/0xacab.org/leap/
    - ln -s "$(pwd)" ${APP_PATH}
@@ -64,8 +66,7 @@ snap:
 
    - git clone https://0xacab.org/leap/riseup_vpn /riseup_vpn
    - cd /riseup_vpn
-   - sed -i 's/https:\/\/0xacab.org\/leap\/bitmask-systray.git$/\/go\/src\/0xacab.org\/leap\/bitmask-systray/' snap/snapcraft.yaml
-   - sed -i 's/.\/bin\/bitmask-systray.git$/.\/bin\/bitmask-systray/' snap/snapcraft.yaml
+   - sed -i 's/go-importpath:.*$/source: \/go\/src\/0xacab.org\/leap\/bitmask-systray\/cmd\/bitmask-vpn/' snap/snapcraft.yaml
    - sed -i 's/git clone.*$//' snap/version.sh
    - sed -i 's/git -C bitmask-systray/git -C \/go\/src\/0xacab.org\/leap\/bitmask-systray/' snap/version.sh
    - snapcraft build
-- 
cgit v1.2.3