github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Update Makefile and CI

Browse Source 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
This commit is contained in:
Maksym Pavlenko 2023-03-13 13:43:08 -07:00
parent ef516a1507
commit c50a3ef043
5 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -390,16 +390,9 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
runtime: runtime:
- io.containerd.runtime.v1.linux
- io.containerd.runc.v1
- io.containerd.runc.v2 - io.containerd.runc.v2
runc: [runc, crun] runc: [runc, crun]
enable_cri_sandboxes: ["", "sandboxed"] enable_cri_sandboxes: ["", "sandboxed"]
exclude:
- runtime: io.containerd.runc.v1
runc: crun
- runtime: io.containerd.runtime.v1.linux
runc: crun
env: env:
GOTEST: gotestsum -- GOTEST: gotestsum --

10
Makefile
View File

@ -254,14 +254,6 @@ bin/gen-manpages: cmd/gen-manpages FORCE
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
$(GO) build ${DEBUG_GO_GCFLAGS} ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@ ${GO_LDFLAGS} $(subst urfave_cli_no_docs,,${GO_TAGS}) ./cmd/gen-manpages $(GO) build ${DEBUG_GO_GCFLAGS} ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@ ${GO_LDFLAGS} $(subst urfave_cli_no_docs,,${GO_TAGS}) ./cmd/gen-manpages
bin/containerd-shim: cmd/containerd-shim FORCE # set !cgo and omit pie for a static shim build: https://github.com/golang/go/issues/17789#issuecomment-258542220
@echo "$(WHALE) $@"
@CGO_ENABLED=${SHIM_CGO_ENABLED} $(GO) build ${GO_BUILD_FLAGS} -o $@ ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim
bin/containerd-shim-runc-v1: cmd/containerd-shim-runc-v1 FORCE # set !cgo and omit pie for a static shim build: https://github.com/golang/go/issues/17789#issuecomment-258542220
@echo "$(WHALE) $@"
@CGO_ENABLED=${SHIM_CGO_ENABLED} $(GO) build ${GO_BUILD_FLAGS} -o $@ ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim-runc-v1
bin/containerd-shim-runc-v2: cmd/containerd-shim-runc-v2 FORCE # set !cgo and omit pie for a static shim build: https://github.com/golang/go/issues/17789#issuecomment-258542220 bin/containerd-shim-runc-v2: cmd/containerd-shim-runc-v2 FORCE # set !cgo and omit pie for a static shim build: https://github.com/golang/go/issues/17789#issuecomment-258542220
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
@CGO_ENABLED=${SHIM_CGO_ENABLED} $(GO) build ${GO_BUILD_FLAGS} -o $@ ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim-runc-v2 @CGO_ENABLED=${SHIM_CGO_ENABLED} $(GO) build ${GO_BUILD_FLAGS} -o $@ ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim-runc-v2
@ -400,7 +392,7 @@ clean: ## clean up binaries
clean-test: ## clean up debris from previously failed tests clean-test: ## clean up debris from previously failed tests
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
$(eval containers=$(shell find /run/containerd/runc -mindepth 2 -maxdepth 3 -type d -exec basename {} \;)) $(eval containers=$(shell find /run/containerd/runc -mindepth 2 -maxdepth 3 -type d -exec basename {} \;))
$(shell pidof containerd containerd-shim runc | xargs -r -n 1 kill -9) $(shell pidof containerd runc | xargs -r -n 1 kill -9)
@( for container in $(containers); do \ @( for container in $(containers); do \
grep $$container /proc/self/mountinfo | while read -r mountpoint; do \ grep $$container /proc/self/mountinfo | while read -r mountpoint; do \
umount $$(echo $$mountpoint | awk '{print $$5}'); \ umount $$(echo $$mountpoint | awk '{print $$5}'); \

3
Makefile.darwin
View File

@ -13,9 +13,6 @@
# limitations under the License. # limitations under the License.
#darwin specific settings
COMMANDS += containerd-shim
# amd64 supports go test -race # amd64 supports go test -race
ifeq ($(GOARCH),amd64) ifeq ($(GOARCH),amd64)
TESTFLAGS_RACE= -race TESTFLAGS_RACE= -race

1
Makefile.freebsd
View File

@ -14,7 +14,6 @@
#freebsd specific settings #freebsd specific settings
COMMANDS += containerd-shim
# amd64 supports go test -race # amd64 supports go test -race
ifeq ($(GOARCH),amd64) ifeq ($(GOARCH),amd64)

2
Makefile.linux
View File

@ -16,7 +16,7 @@
#linux specific settings #linux specific settings
WHALE="+" WHALE="+"
ONI="-" ONI="-"
COMMANDS += containerd-shim containerd-shim-runc-v1 containerd-shim-runc-v2 COMMANDS += containerd-shim-runc-v2
# check GOOS for cross compile builds # check GOOS for cross compile builds
ifeq ($(GOOS),linux) ifeq ($(GOOS),linux)