From 2e9975568f7b4ffcc6c0f0b507fb0d0d64350a6a Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Thu, 28 Nov 2019 10:39:05 -0600
Subject: [pkg] stop building snap from riseup_vpn

---
 .gitlab-ci.yml | 74 +---------------------------------------------------------
 1 file changed, 1 insertion(+), 73 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b8ab4d..23575cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,79 +29,6 @@ build_test:
       - 'bitmask-connect'
     expire_in: 1 month
 
-# win_installer:
-#  image: 0xacab.org:4567/leap/docker/bitmask-vpn:latest
-#  stage: build
-#  script:
-#    - mkdir -p /go/src/0xacab.org/leap/
-#    - ln -s "$(pwd)" ${APP_PATH}
-#    - cd ${APP_PATH}
-# 
-#    # we need to manually patch w32 until they merge #81
-#    - mkdir -p /go/src/github.com/AllenDang/
-#    - cd /go/src/github.com/AllenDang/
-#    - git clone https://github.com/AllenDang/w32
-#    - cd w32
-#    - curl https://downloads.leap.se/thirdparty/w32.patch | patch -p1 -N
-# 
-#    - cd ${APP_PATH}
-# 
-#    - git clone https://0xacab.org/leap/riseup_vpn
-#    - cd riseup_vpn
-#    - make openvpn_cross_win
-#    - make build_cross_win
-#    - mv dist/RiseupVPN-*.exe ..
-#  tags:
-#    - linux
-#  artifacts:
-#    name: installer_win_$CI_COMMIT_REF_NAME
-#    paths:
-#      - RiseupVPN-*.exe
-#    expire_in: 1 month
-
-snap:
- image: registry.0xacab.org/leap/docker/bitmask-vpn:latest
- stage: build
- script:
-   - mkdir -p /go/src/0xacab.org/leap/
-   - ln -s "$(pwd)" ${APP_PATH}
-
-   - git clone https://0xacab.org/leap/riseup_vpn /riseup_vpn
-   - cd /riseup_vpn
-   - sed -i 's/https:\/\/0xacab.org\/leap\/bitmask-vpn.*$/\/go\/src\/0xacab.org\/leap\/bitmask-vpn/' snap/snapcraft.yaml
-   - sed -i 's/git clone.*$//' snap/version.sh
-   - sed -i 's/git -C bitmask-vpn/git -C \/go\/src\/0xacab.org\/leap\/bitmask-vpn/' snap/version.sh
-   - snapcraft snap
-   - mv riseup-vpn*.snap ${APP_PATH}
- tags:
-   - linux
- artifacts:
-   name: snap_$CI_COMMIT_REF_NAME
-   paths:
-     - riseup-vpn*.snap
-   expire_in: 1 month
-
-# osx_installer:
-#   stage: build
-#   allow_failure: true
-#   variables:
-#       GOPATH: /tmp/go/
-#       APP_PATH: /tmp/go/src/0xacab.org/leap/bitmask-vpn
-#   script:
-#     - git clone https://0xacab.org/leap/riseup_vpn
-#     - cd riseup_vpn
-#     - make openvpn_osx
-#     - make build_osx
-#   tags:
-#     - yosemite
-#     - osx
-#   artifacts:
-#     name: installer_osx_$CI_COMMIT_REF_NAME
-#     paths:
-#       - riseup_vpn/dist/RiseupVPN-*.pkg
-#   expire_in: 1 month
-
-
 branded_push:
   image: registry.0xacab.org/leap/docker/bitmask-vpn:latest
   stage: push
@@ -142,6 +69,7 @@ vendorize:
   artifacts:
     name: installers-$CI_COMMIT_REF_NAME
     paths:
+      - 'deploy/*.snap'
       - 'deploy/RiseupVPN-*.exe'
       - 'deploy/RiseupVPN-*.pkg'
       - 'deploy/riseup-vpn_*.deb'
-- 
cgit v1.2.3