diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index dd1a73cc..4e79bbdb 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -196,38 +196,38 @@ jobs: go-version: '1.14.2' - uses: actions/checkout@v2 -# - name: Install cross compiling libraries -# run: | -# sudo apt-get update -# sudo apt-get install -y automake autogen build-essential ca-certificates libsqlite3-dev \ -# gcc-5-arm-linux-gnueabi g++-5-arm-linux-gnueabi libc6-dev-armel-cross linux-headers-generic \ -# gcc-5-arm-linux-gnueabihf g++-5-arm-linux-gnueabihf libc6-dev-armhf-cross \ -# gcc-5-aarch64-linux-gnu g++-5-aarch64-linux-gnu libc6-dev-arm64-cross \ -# gcc-5-mips-linux-gnu g++-5-mips-linux-gnu libc6-dev-mips-cross \ -# gcc-5-mipsel-linux-gnu g++-5-mipsel-linux-gnu libc6-dev-mipsel-cross \ -# gcc-5-mips64-linux-gnuabi64 g++-5-mips64-linux-gnuabi64 libc6-dev-mips64-cross \ -# gcc-5-mips64el-linux-gnuabi64 g++-5-mips64el-linux-gnuabi64 libc6-dev-mips64el-cross \ -# gcc-5-multilib g++-5-multilib gcc-mingw-w64 g++-mingw-w64 clang llvm-dev \ -# gcc-6-arm-linux-gnueabi g++-6-arm-linux-gnueabi libc6-dev-armel-cross \ -# gcc-6-arm-linux-gnueabihf g++-6-arm-linux-gnueabihf libc6-dev-armhf-cross \ -# gcc-6-aarch64-linux-gnu g++-6-aarch64-linux-gnu libc6-dev-arm64-cross \ -# gcc-6-mips-linux-gnu g++-6-mips-linux-gnu libc6-dev-mips-cross \ -# gcc-6-mipsel-linux-gnu g++-6-mipsel-linux-gnu libc6-dev-mipsel-cross \ -# gcc-6-mips64-linux-gnuabi64 g++-6-mips64-linux-gnuabi64 libc6-dev-mips64-cross \ -# gcc-6-mips64el-linux-gnuabi64 g++-6-mips64el-linux-gnuabi64 libc6-dev-mips64el-cross \ -# gcc-6-multilib gcc-7-multilib g++-6-multilib gcc-mingw-w64 g++-mingw-w64 clang llvm-dev \ -# libtool libxml2-dev uuid-dev libssl-dev swig openjdk-8-jdk pkg-config patch \ -# make xz-utils cpio wget zip unzip p7zip git mercurial bzr texinfo help2man cmake --no-install-recommends -# sudo ln -s /usr/include/asm-generic/ /usr/include/asm + - name: Install cross compiling libraries + run: | + sudo apt-get update + sudo apt-get install -y automake autogen build-essential ca-certificates libsqlite3-dev \ + gcc-5-arm-linux-gnueabi g++-5-arm-linux-gnueabi libc6-dev-armel-cross linux-headers-generic \ + gcc-5-arm-linux-gnueabihf g++-5-arm-linux-gnueabihf libc6-dev-armhf-cross \ + gcc-5-aarch64-linux-gnu g++-5-aarch64-linux-gnu libc6-dev-arm64-cross \ + gcc-5-mips-linux-gnu g++-5-mips-linux-gnu libc6-dev-mips-cross \ + gcc-5-mipsel-linux-gnu g++-5-mipsel-linux-gnu libc6-dev-mipsel-cross \ + gcc-5-mips64-linux-gnuabi64 g++-5-mips64-linux-gnuabi64 libc6-dev-mips64-cross \ + gcc-5-mips64el-linux-gnuabi64 g++-5-mips64el-linux-gnuabi64 libc6-dev-mips64el-cross \ + gcc-5-multilib g++-5-multilib gcc-mingw-w64 g++-mingw-w64 clang llvm-dev \ + gcc-6-arm-linux-gnueabi g++-6-arm-linux-gnueabi libc6-dev-armel-cross \ + gcc-6-arm-linux-gnueabihf g++-6-arm-linux-gnueabihf libc6-dev-armhf-cross \ + gcc-6-aarch64-linux-gnu g++-6-aarch64-linux-gnu libc6-dev-arm64-cross \ + gcc-6-mips-linux-gnu g++-6-mips-linux-gnu libc6-dev-mips-cross \ + gcc-6-mipsel-linux-gnu g++-6-mipsel-linux-gnu libc6-dev-mipsel-cross \ + gcc-6-mips64-linux-gnuabi64 g++-6-mips64-linux-gnuabi64 libc6-dev-mips64-cross \ + gcc-6-mips64el-linux-gnuabi64 g++-6-mips64el-linux-gnuabi64 libc6-dev-mips64el-cross \ + gcc-6-multilib gcc-7-multilib g++-6-multilib gcc-mingw-w64 g++-mingw-w64 clang llvm-dev \ + libtool libxml2-dev uuid-dev libssl-dev swig openjdk-8-jdk pkg-config patch \ + make xz-utils cpio wget zip unzip p7zip git mercurial bzr texinfo help2man cmake --no-install-recommends + sudo ln -s /usr/include/asm-generic/ /usr/include/asm -# - name: Install MacOSX compiler -# run: | -# cd / -# git clone https://github.com/tpoechtrager/osxcross.git -# cd osxcross && git checkout 88cb6e8d0d7675cae7c8a2d66c11f58237101df0 && cd ../ -# wget https://s3.dockerproject.org/darwin/v2/MacOSX10.11.sdk.tar.xz -# mv MacOSX10.11.sdk.tar.xz /osxcross/tarballs/ -# OSX_VERSION_MIN=10.10 UNATTENDED=1 LD_LIBRARY_PATH=/osxcross/target/lib /osxcross/build.sh + - name: Install MacOSX compiler + run: | + cd / + git clone https://github.com/tpoechtrager/osxcross.git + cd osxcross && git checkout 88cb6e8d0d7675cae7c8a2d66c11f58237101df0 && cd ../ + wget https://s3.dockerproject.org/darwin/v2/MacOSX10.11.sdk.tar.xz + mv MacOSX10.11.sdk.tar.xz /osxcross/tarballs/ + OSX_VERSION_MIN=10.10 UNATTENDED=1 LD_LIBRARY_PATH=/osxcross/target/lib /osxcross/build.sh - name: Setting ENV's run: | diff --git a/Makefile b/Makefile index 35e1b1a4..c7d3e9b4 100644 --- a/Makefile +++ b/Makefile @@ -168,7 +168,7 @@ build-darwin: build-linux: CGO_ENABLED=1 GO111MODULE="on" GOOS=linux GOARCH=amd64 \ go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION}" -o releases/statping-linux-amd64/statping --tags "linux" ./cmd - GO111MODULE="on" GOOS=linux GOARCH=386 \ + CGO_ENABLED=1 GO111MODULE="on" GOOS=linux GOARCH=386 \ go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION}" -o releases/statping-linux-386/statping --tags "linux" ./cmd build-linux-arm: