summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2019-01-17 20:10:08 +0100
committerRuben Pollan <meskio@sindominio.net>2019-01-18 00:28:33 +0100
commit8e804ebe4ff520a91fd65833a9b0b4c603e5e75b (patch)
tree8a66ceae45dabaab7263955e0b3a57e3e29e0cc9
parentd788da5f6914f72abd16b9c51b8f5ad729aba86a (diff)
[test] fix ci builds after the refactor
-rw-r--r--.gitlab-ci.yml17
-rw-r--r--vendor/github.com/AllenDang/w32/user32.go2
2 files changed, 9 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2613cbf..51ad08f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
variables:
GOPATH: /go
- APP_PATH: /go/src/0xacab.org/leap/bitmask-systray
+ APP_PATH: /go/src/0xacab.org/leap/bitmask-vpn
build_test:
image: 0xacab.org:4567/leap/docker/bitmask-systray:latest
@@ -15,13 +15,15 @@ build_test:
- cd ${APP_PATH}
- make get
- make test
- - make bitmaskd
+ - make build_bitmaskd
- make build
tags:
- linux
artifacts:
paths:
- - 'bitmask-systray'
+ - 'bitmask-vpn'
+ - 'bitmask-helper'
+ - 'bitmask-connect'
expire_in: 1 month
win_installer:
@@ -57,20 +59,17 @@ 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}
- git clone https://0xacab.org/leap/riseup_vpn /riseup_vpn
- cd /riseup_vpn
- - sed -i "s/source:.*$/source: \/go\/src\/0xacab.org\/leap\/bitmask-vpn/" snap/snapcraft.yaml
+ - 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 build
+ - 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 /go/src/0xacab.org/leap/bitmask-systray/
+ - mv riseup-vpn*.snap ${APP_PATH}
tags:
- linux
artifacts:
diff --git a/vendor/github.com/AllenDang/w32/user32.go b/vendor/github.com/AllenDang/w32/user32.go
index 1d1a0ab..8286e89 100644
--- a/vendor/github.com/AllenDang/w32/user32.go
+++ b/vendor/github.com/AllenDang/w32/user32.go
@@ -1037,7 +1037,7 @@ func RedrawWindow(hWnd HWND, lpRect *RECT, hrgnUpdate HRGN, flag uint32) {
uintptr(hWnd),
uintptr(unsafe.Pointer(lpRect)),
uintptr(hrgnUpdate),
- flag,
+ uintptr(flag),
)
if ret!=0{
panic("RedrawWindow fail")