Fix hcsshim commit detection
Hack with space in grep, so it won't match github.com/Microsoft/hcsshim/test Signed-off-by: Shengjing Zhu <zhsj@debian.org>
This commit is contained in:
parent
553a369158
commit
819ac05f34
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@ -199,7 +199,7 @@ jobs:
|
||||
set -o xtrace
|
||||
mingw32-make.exe binaries
|
||||
bindir="$(pwd)"
|
||||
SHIM_COMMIT=$(grep Microsoft/hcsshim vendor.conf | awk '{print $2}')
|
||||
SHIM_COMMIT=$(grep 'Microsoft/hcsshim ' go.mod | awk '{print $2}')
|
||||
cd ../../Microsoft/hcsshim
|
||||
git fetch --tags origin "${SHIM_COMMIT}"
|
||||
git checkout "${SHIM_COMMIT}"
|
||||
|
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@ -91,7 +91,7 @@ jobs:
|
||||
id: hcsshim_commit
|
||||
if: startsWith(matrix.os, 'windows')
|
||||
shell: bash
|
||||
run: echo "::set-output name=sha::$(grep Microsoft/hcsshim vendor.conf | awk '{print $2}')"
|
||||
run: echo "::set-output name=sha::$(grep 'Microsoft/hcsshim ' go.mod | awk '{print $2}')"
|
||||
working-directory: src/github.com/containerd/containerd
|
||||
|
||||
- name: Checkout hcsshim source
|
||||
|
Loading…
Reference in New Issue
Block a user