Skip to content

Commit 709953b

Browse files
authored
Merge pull request #1929 from SergeyKanzhelev/AllVersionAroHigherThen15
remove unnecessary build step on Windows
2 parents 80b852a + bddc6ad commit 709953b

File tree

1 file changed

+0
-22
lines changed

1 file changed

+0
-22
lines changed

.github/workflows/containerd.yml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -245,28 +245,6 @@ jobs:
245245
sudo -E PATH=$PATH script/setup/install-runc
246246
working-directory: src/github.com/containerd/containerd
247247

248-
- name: Build Windows container shims
249-
# After Containerd 1.5 just a 'make' or 'make binaries' invocation will build the windows shim alongside the daemon, ctr, and
250-
# other binaries so this step is only needed on < 1.6
251-
if: startsWith(matrix.os, 'windows') && matrix.version != 'main'
252-
shell: bash
253-
run: |
254-
set -o xtrace
255-
export CGO_ENABLED=1
256-
cd src/github.com/containerd/containerd
257-
mingw32-make.exe binaries
258-
bindir="$(pwd)"/bin
259-
if [ -f "vendor.conf" ]; then
260-
SHIM_COMMIT=$(grep 'Microsoft/hcsshim' vendor.conf | awk '{print $2}')
261-
else
262-
SHIM_COMMIT=$(grep 'Microsoft/hcsshim ' go.mod | awk '{print $2}')
263-
fi
264-
cd ../../Microsoft/hcsshim
265-
git fetch --tags origin "${SHIM_COMMIT}"
266-
git checkout "${SHIM_COMMIT}"
267-
GO111MODULE=on go build -mod=vendor -o "${bindir}/containerd-shim-runhcs-v1.exe" ./cmd/containerd-shim-runhcs-v1
268-
cp "${bindir}"/*.exe /usr/local/bin
269-
270248
- name: Build cri-tools on Linux
271249
if: startsWith(matrix.os, 'ubuntu')
272250
run: |

0 commit comments

Comments
 (0)