From a154c2b3b12a1eb61580729fd7d66025b5b4ebf6 Mon Sep 17 00:00:00 2001
From: Ruben Pollan <meskio@sindominio.net>
Date: Tue, 12 Jun 2018 19:24:13 +0200
Subject: [PATCH] [pkg] compile for gtk_3_18 or older
- Resolves: #45
---
.gitlab-ci.yml | 4 ++--
Makefile | 12 +++++++++---
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d72274a2..be715051 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,8 +15,8 @@ build_test:
- mkdir -p /go/src/0xacab.org/leap/
- ln -s "$(pwd)" ${APP_PATH}
- cd ${APP_PATH}
- - go get .
- - go test ./...
+ - make get
+ - make test
- make build
tags:
- linux
diff --git a/Makefile b/Makefile
index 696fcea1..33a2d6c2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,15 @@
-.PHONY: all build icon locales generate_locales clean
+.PHONY: all get build icon locales generate_locales clean
-all: icon locales build
+all: icon locales get build
+
+get:
+ go get -tags 'gtk_3_18' .
build:
- go build -ldflags "-X main.version=`git describe --tags`"
+ go build -tags 'gtk_3_18' -ldflags "-X main.version=`git describe --tags`"
+
+test:
+ go test -tags 'gtk_3_18' ./...
clean:
make -C icon clean
--
GitLab