From 07f1279471b42eadcdb11b9af76b967c245bb0ab Mon Sep 17 00:00:00 2001 From: Ivan Markin Date: Thu, 15 Mar 2018 18:18:44 +0000 Subject: [PATCH] Add OpenBSD/amd64 crossbuild to CI scripts Signed-off-by: Ivan Markin --- .gitlab-ci.yml | 3 ++- .travis.yml | 3 ++- mk/build.mk | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b7fe2289..0fa77afb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,8 +40,9 @@ before_script: <<: *build_base script: make build-x -linux amd64: *build_validate darwin amd64: *build_x +linux amd64: *build_validate +openbsd amd64: *build_x windows amd64: *build_x linux arm: *build_x linux arm64: *build_x diff --git a/.travis.yml b/.travis.yml index 9c30fd13..1bfa1de6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,9 @@ language: bash services: docker env: matrix: - - TARGET_OS=linux TARGET_ARCH=amd64 TARGETS="build validate" - TARGET_OS=darwin TARGET_ARCH=amd64 TARGETS="build-x" + - TARGET_OS=linux TARGET_ARCH=amd64 TARGETS="build validate" + - TARGET_OS=openbsd TARGET_ARCH=amd64 TARGETS="build-x" - TARGET_OS=windows TARGET_ARCH=amd64 TARGETS="build-x" - TARGET_OS=linux TARGET_ARCH=arm TARGETS="build-x" - TARGET_OS=linux TARGET_ARCH=arm64 TARGETS="build-x" diff --git a/mk/build.mk b/mk/build.mk index b69acf19..b3af9955 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -1,10 +1,11 @@ extension = $(patsubst windows,.exe,$(filter windows,$(1))) # Valid target combinations -VALID_OS_ARCH := "[darwin/amd64][linux/amd64][linux/arm][linux/arm64][windows/amd64][windows/386]" +VALID_OS_ARCH := "[darwin/amd64][linux/amd64][linux/arm][linux/arm64][openbsd/amd64][windows/amd64][windows/386]" os.darwin := Darwin os.linux := Linux +os.openbsd := OpenBSD os.windows := Windows arch.amd64 := x86_64