diff options
| author | Dave Chen <dave.jungler@gmail.com> | 2020-02-17 19:29:26 +0800 |
|---|---|---|
| committer | Dave Chen <dave.jungler@gmail.com> | 2020-02-17 19:29:26 +0800 |
| commit | c6290bb81b62a373da6896fe758b97a75239b5ec (patch) | |
| tree | 5be08ef795fa9325c7daaf406a26a2b4b5cefe93 | |
| parent | Merge pull request #1465 from kevin-wangzefeng/changelogs (diff) | |
| download | kubeedge-c6290bb81b62a373da6896fe758b97a75239b5ec.tar.gz | |
Fix the gating issue with ubuntu distro
- upgrade ubuntu distro from `xenial` to `cosmic` and make
it a default config
- fix the cross-building issue by add the mandatory packages.
- make `cross_build` target build arm64 instead of arm32 since
arm64 is used more widely.
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | edge/Makefile | 5 | ||||
| -rw-r--r-- | edgesite/Makefile | 5 |
3 files changed, 9 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 9c3291369..18906048c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ git: sudo: required -dist: xenial +dist: cosmic services: - docker @@ -33,14 +33,16 @@ jobs: script: - make verify - make lint - + - stage: "Test on amd64" name: "build, smallbuild, crossbuild" arch: amd64 - dist: trusty before_script: - sudo apt-get install upx-ucl -y + - sudo apt-get install gcc-aarch64-linux-gnu -y + - sudo apt-get install libc6-dev-arm64-cross -y - sudo apt-get install gcc-arm-linux-gnueabi -y + - sudo apt-get install libc6-dev-armel-cross -y - export GOFLAGS=-mod=vendor script: - make @@ -85,7 +87,6 @@ jobs: - stage: "Test on arm64" name: "build, smallbuild" arch: arm64 - dist: trusty before_script: - export GOFLAGS=-mod=vendor - sudo apt-get install upx-ucl -y diff --git a/edge/Makefile b/edge/Makefile index 3403eb822..4886fd47d 100644 --- a/edge/Makefile +++ b/edge/Makefile @@ -37,11 +37,10 @@ clean: .PHONY: cross_build cross_build: verify - export GOARCH=arm \ + export GOARCH=arm64 \ export GOOS="linux" \ - export GOARM=6 \ export CGO_ENABLED=1 \ - export CC=arm-linux-gnueabi-gcc; \ + export CC=aarch64-linux-gnu-gcc; \ go build cmd/edgecore/edgecore.go .PHONY: armv7 diff --git a/edgesite/Makefile b/edgesite/Makefile index 9af0ac376..eb3c10069 100644 --- a/edgesite/Makefile +++ b/edgesite/Makefile @@ -11,11 +11,10 @@ verify: .PHONY: cross_build cross_build: verify - export GOARCH=arm \ + export GOARCH=arm64 \ export GOOS="linux" \ - export GOARM=6 \ export CGO_ENABLED=1 \ - export CC=arm-linux-gnueabi-gcc; \ + export CC=aarch64-linux-gnu-gcc; \ go build cmd/edgesite/edgesite.go .PHONY: armv7 |