From c50a3ef0434cc1961311003e7ec6ab08d4bebdc7 Mon Sep 17 00:00:00 2001
From: Maksym Pavlenko <pavlenko.maksym@gmail.com>
Date: Mon, 13 Mar 2023 13:43:08 -0700
Subject: [PATCH] Update Makefile and CI

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
---
 .github/workflows/ci.yml |  7 -------
 Makefile                 | 10 +---------
 Makefile.darwin          |  3 ---
 Makefile.freebsd         |  1 -
 Makefile.linux           |  2 +-
 5 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 19f541e44..0bffbdf5b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -390,16 +390,9 @@ jobs:
       fail-fast: false
       matrix:
         runtime:
-          - io.containerd.runtime.v1.linux
-          - io.containerd.runc.v1
           - io.containerd.runc.v2
         runc: [runc, crun]
         enable_cri_sandboxes: ["", "sandboxed"]
-        exclude:
-          - runtime: io.containerd.runc.v1
-            runc: crun
-          - runtime: io.containerd.runtime.v1.linux
-            runc: crun
 
     env:
       GOTEST: gotestsum --
diff --git a/Makefile b/Makefile
index 02a8aa202..ee42d7c48 100644
--- a/Makefile
+++ b/Makefile
@@ -254,14 +254,6 @@ bin/gen-manpages: cmd/gen-manpages FORCE
 	@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
 
-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
 	@echo "$(WHALE) $@"
 	@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
 	@echo "$(WHALE) $@"
 	$(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 \
 	    grep $$container /proc/self/mountinfo | while read -r mountpoint; do \
 		umount $$(echo $$mountpoint | awk '{print $$5}'); \
diff --git a/Makefile.darwin b/Makefile.darwin
index 5303ca40a..4a12e88f2 100644
--- a/Makefile.darwin
+++ b/Makefile.darwin
@@ -13,9 +13,6 @@
 #   limitations under the License.
 
 
-#darwin specific settings
-COMMANDS += containerd-shim
-
 # amd64 supports go test -race
 ifeq ($(GOARCH),amd64)
 	TESTFLAGS_RACE= -race
diff --git a/Makefile.freebsd b/Makefile.freebsd
index 78e7f2de4..a32c3f752 100644
--- a/Makefile.freebsd
+++ b/Makefile.freebsd
@@ -14,7 +14,6 @@
 
 
 #freebsd specific settings
-COMMANDS += containerd-shim
 
 # amd64 supports go test -race
 ifeq ($(GOARCH),amd64)
diff --git a/Makefile.linux b/Makefile.linux
index 054140070..1616b3a0c 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -16,7 +16,7 @@
 #linux specific settings
 WHALE="+"
 ONI="-"
-COMMANDS += containerd-shim containerd-shim-runc-v1 containerd-shim-runc-v2
+COMMANDS += containerd-shim-runc-v2
 
 # check GOOS for cross compile builds
 ifeq ($(GOOS),linux)