Skip to content

Commit 819ac05

Browse files
committed
Fix hcsshim commit detection
Hack with space in grep, so it won't match github.com/Microsoft/hcsshim/test Signed-off-by: Shengjing Zhu <[email protected]>
1 parent 553a369 commit 819ac05

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ jobs:
199199
set -o xtrace
200200
mingw32-make.exe binaries
201201
bindir="$(pwd)"
202-
SHIM_COMMIT=$(grep Microsoft/hcsshim vendor.conf | awk '{print $2}')
202+
SHIM_COMMIT=$(grep 'Microsoft/hcsshim ' go.mod | awk '{print $2}')
203203
cd ../../Microsoft/hcsshim
204204
git fetch --tags origin "${SHIM_COMMIT}"
205205
git checkout "${SHIM_COMMIT}"

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
id: hcsshim_commit
9292
if: startsWith(matrix.os, 'windows')
9393
shell: bash
94-
run: echo "::set-output name=sha::$(grep Microsoft/hcsshim vendor.conf | awk '{print $2}')"
94+
run: echo "::set-output name=sha::$(grep 'Microsoft/hcsshim ' go.mod | awk '{print $2}')"
9595
working-directory: src/github.com/containerd/containerd
9696

9797
- name: Checkout hcsshim source

0 commit comments

Comments
 (0)