adelorenzo/kilo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile: bump golang toolchain for M1 support

Browse Source 
This commit bumps the Golang toolchain version used to build Kilo to go
1.16 to support builing kgctl for the arm64 M1 macs.

Signed-off-by: Lucas Servén Marín <lserven@gmail.com>
This commit is contained in:
Lucas Servén Marín 2021-06-14 12:56:20 +02:00
parent cc7e94b07c
commit 0ab16e11b8
No known key found for this signature in database
GPG Key ID: 586FEAF680DA74AD
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.github/workflows/ci.yml vendored
View File

@ -18,7 +18,7 @@ jobs:
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.15.7 go-version: 1.16.5
- name: Build - name: Build
run: make run: make
@ -29,7 +29,7 @@ jobs:
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.15.7 go-version: 1.16.5
- name: Build kg and kgctl for all Linux Architectures - name: Build kg and kgctl for all Linux Architectures
run: make all-build run: make all-build
@ -40,9 +40,11 @@ jobs:
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.15.7 go-version: 1.16.5
- name: Build kgctl for Darwin - name: Build kgctl for Darwin amd64
run: make OS=darwin run: make OS=darwin ARCH=amd64
- name: Build kgctl for Darwin arm64
run: make OS=darwin ARCH=arm64
windows: windows:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -51,7 +53,7 @@ jobs:
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.15.7 go-version: 1.16.5
- name: Build kgctl for Windows - name: Build kgctl for Windows
run: make OS=windows run: make OS=windows
@ -62,7 +64,7 @@ jobs:
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.15.7 go-version: 1.16.5
- name: Run Unit Tests - name: Run Unit Tests
run: make unit run: make unit
@ -74,7 +76,7 @@ jobs:
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.15.7 go-version: 1.16.5
- name: Run e2e Tests - name: Run e2e Tests
run: make e2e run: make e2e
@ -85,7 +87,7 @@ jobs:
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.15.7 go-version: 1.16.5
- name: Lint Code - name: Lint Code
run: make lint run: make lint
@ -96,7 +98,7 @@ jobs:
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.15.7 go-version: 1.16.5
- name: Enable Experimental Docker CLI - name: Enable Experimental Docker CLI
run: | run: |
echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json
@ -125,7 +127,7 @@ jobs:
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.15.7 go-version: 1.16.5
- name: Enable Experimental Docker CLI - name: Enable Experimental Docker CLI
run: | run: |
echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json

2
.github/workflows/release.yaml vendored
View File

@ -10,7 +10,7 @@ jobs:
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.15.7 go-version: 1.16.5
- name: Make Directory with kgctl Binaries to Be Released - name: Make Directory with kgctl Binaries to Be Released
run: make release run: make release
- name: Publish Release - name: Publish Release

7
Makefile
View File

@ -3,7 +3,6 @@ export GO111MODULE=on
OS ?= $(shell go env GOOS) OS ?= $(shell go env GOOS)
ARCH ?= $(shell go env GOARCH) ARCH ?= $(shell go env GOARCH)
ALL_OS := linux darwin windows
ALL_ARCH := amd64 arm arm64 ALL_ARCH := amd64 arm arm64
DOCKER_ARCH := "amd64" "arm v7" "arm64 v8" DOCKER_ARCH := "amd64" "arm v7" "arm64 v8"
ifeq ($(OS),linux) ifeq ($(OS),linux)
@ -11,7 +10,7 @@ ifeq ($(OS),linux)
else else
BINS := bin/$(OS)/$(ARCH)/kgctl BINS := bin/$(OS)/$(ARCH)/kgctl
endif endif
RELEASE_BINS := $(addprefix bin/release/kgctl-, $(addprefix linux-, $(ALL_ARCH)) darwin-amd64 windows-amd64) RELEASE_BINS := $(addprefix bin/release/kgctl-, $(addprefix linux-, $(ALL_ARCH)) darwin-amd64 darwin-arm64 windows-amd64)
PROJECT := kilo PROJECT := kilo
PKG := github.com/squat/$(PROJECT) PKG := github.com/squat/$(PROJECT)
REGISTRY ?= index.docker.io REGISTRY ?= index.docker.io
@ -44,8 +43,8 @@ KIND_BINARY := $(shell pwd)/bin/kind
KUBECTL_BINARY := $(shell pwd)/bin/kubectl KUBECTL_BINARY := $(shell pwd)/bin/kubectl
BASH_UNIT := $(shell pwd)/bin/bash_unit BASH_UNIT := $(shell pwd)/bin/bash_unit
BUILD_IMAGE ?= golang:1.15.7-alpine BUILD_IMAGE ?= golang:1.16.5-alpine
BASE_IMAGE ?= alpine:3.12 BASE_IMAGE ?= alpine:3.13
build: $(BINS) build: $(BINS)