From 88de65112a3f6016e6f75c596d46b7bb683ef59e Mon Sep 17 00:00:00 2001
From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com>
Date: Fri, 11 Mar 2022 05:20:55 +1100
Subject: [PATCH] Don't build a second copy of containerd-shim-runhcs-v1.exe

`make binaries` already builds containerd-shim-runhcs-v1.exe next to
containerd.exe, so there's no need to spend time checking out and
building it again.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
---
 .github/workflows/ci.yml               | 11 -----------
 .github/workflows/windows-periodic.yml |  7 -------
 2 files changed, 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8e2b005e8..e67ce846c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -254,11 +254,6 @@ jobs:
         with:
           path: src/github.com/containerd/containerd
 
-      - uses: actions/checkout@v2
-        with:
-          repository: Microsoft/hcsshim
-          path: src/github.com/Microsoft/hcsshim
-
       - uses: actions/checkout@v2
         with:
           repository: kubernetes-sigs/cri-tools
@@ -279,12 +274,6 @@ jobs:
         run: |
           set -o xtrace
           mingw32-make.exe binaries
-          bindir="$(pwd)"
-          SHIM_COMMIT=$(grep 'Microsoft/hcsshim ' go.mod | awk '{print $2}')
-          cd ../../Microsoft/hcsshim
-          git fetch --tags origin "${SHIM_COMMIT}"
-          git checkout "${SHIM_COMMIT}"
-          GO111MODULE=on go build -mod=vendor -o "${bindir}/integration/client/containerd-shim-runhcs-v1.exe" ./cmd/containerd-shim-runhcs-v1
           cd ../../kubernetes-sigs/cri-tools
           make critest
 
diff --git a/.github/workflows/windows-periodic.yml b/.github/workflows/windows-periodic.yml
index e128cf79b..66a9f1f5c 100644
--- a/.github/workflows/windows-periodic.yml
+++ b/.github/workflows/windows-periodic.yml
@@ -150,13 +150,6 @@ jobs:
         run: |
           ssh -i $HOME/.ssh/id_rsa ${{ env.SSH_OPTS }} azureuser@${{ env.VM_PUB_IP }} "git clone http://github.com/containerd/containerd c:\\containerd "
           ssh -i $HOME/.ssh/id_rsa ${{ env.SSH_OPTS }} azureuser@${{ env.VM_PUB_IP }} "cd c:\containerd ; make binaries"
-          ssh -i $HOME/.ssh/id_rsa ${{ env.SSH_OPTS }} azureuser@${{ env.VM_PUB_IP }} "git clone http://github.com/Microsoft/hcsshim c:\containerd\hcsshim "
-
-          # Get shim commit from containerd local repo
-          SHIM_COMMIT=$(grep 'Microsoft/hcsshim' go.mod | awk '{ print $2 }');
-
-          ssh -i $HOME/.ssh/id_rsa ${{ env.SSH_OPTS }} azureuser@${{ env.VM_PUB_IP }} "cd c:\containerd\hcsshim; git fetch --tags origin $SHIM_COMMIT ; \
-                            git checkout $SHIM_COMMIT ; go build -mod=vendor -o ${{ env.REMOTE_VM_BIN_PATH }}\containerd-shim-runhcs-v1.exe .\cmd\containerd-shim-runhcs-v1"
 
       - name: RunIntegrationTests
         run: |