Skip to content
Snippets Groups Projects
Unverified Commit 1642cfef authored by Pedro Pombeiro's avatar Pedro Pombeiro
Browse files

Add support for linux/s390x

parent e927003b
Branches
No related tags found
No related merge requests found
...@@ -80,6 +80,7 @@ default: ...@@ -80,6 +80,7 @@ default:
- linux amd64 - linux amd64
- linux arm - linux arm
- linux arm64 - linux arm64
- linux s390x
- windows amd64 - windows amd64
- darwin amd64 - darwin amd64
variables: variables:
...@@ -110,6 +111,7 @@ openbsd amd64: *build_x ...@@ -110,6 +111,7 @@ openbsd amd64: *build_x
windows amd64: *build_x windows amd64: *build_x
linux arm: *build_x linux arm: *build_x
linux arm64: *build_x linux arm64: *build_x
linux s390x: *build_x
release development S3: release development S3:
extends: extends:
......
...@@ -10,6 +10,7 @@ env: ...@@ -10,6 +10,7 @@ env:
- TARGET_OS=windows 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=arm TARGETS="build-x"
- TARGET_OS=linux TARGET_ARCH=arm64 TARGETS="build-x" - TARGET_OS=linux TARGET_ARCH=arm64 TARGETS="build-x"
- TARGET_OS=linux TARGET_ARCH=s390x TARGETS="build-x"
script: script:
- USE_CONTAINER=true make "$TARGETS" - USE_CONTAINER=true make "$TARGETS"
- "[[ \"$(find bin -type f -name docker-machine*)\" != \"\" ]]" - "[[ \"$(find bin -type f -name docker-machine*)\" != \"\" ]]"
...@@ -22,7 +22,7 @@ ifeq ($(TARGET_OS),) ...@@ -22,7 +22,7 @@ ifeq ($(TARGET_OS),)
endif endif
ifeq ($(TARGET_ARCH),) ifeq ($(TARGET_ARCH),)
TARGET_ARCH := amd64 arm arm64 386 TARGET_ARCH := amd64 arm arm64 s390x 386
endif endif
# Output prefix, defaults to local directory if not specified # Output prefix, defaults to local directory if not specified
......
extension = $(patsubst windows,.exe,$(filter windows,$(1))) extension = $(patsubst windows,.exe,$(filter windows,$(1)))
# Valid target combinations # Valid target combinations
VALID_OS_ARCH := "[darwin/amd64][linux/amd64][linux/arm][linux/arm64][openbsd/amd64][windows/amd64][windows/386]" VALID_OS_ARCH := "[darwin/amd64][linux/amd64][linux/arm][linux/arm64][linux/s390x][openbsd/amd64][windows/amd64][windows/386]"
os.darwin := Darwin os.darwin := Darwin
os.linux := Linux os.linux := Linux
...@@ -11,6 +11,7 @@ os.windows := Windows ...@@ -11,6 +11,7 @@ os.windows := Windows
arch.amd64 := x86_64 arch.amd64 := x86_64
arch.arm := armhf arch.arm := armhf
arch.arm64 := aarch64 arch.arm64 := aarch64
arch.s390x := s390x
arch.386 := i386 arch.386 := i386
define gocross define gocross
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment