github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Fix hcsshim commit detection

Browse Source 
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:
Shengjing Zhu
2020-11-22 00:55:44 +08:00
parent 553a369158
commit 819ac05f34
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@@ -199,7 +199,7 @@ jobs:
set -o xtrace set -o xtrace
mingw32-make.exe binaries mingw32-make.exe binaries
bindir="$(pwd)" 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 cd ../../Microsoft/hcsshim
git fetch --tags origin "${SHIM_COMMIT}" git fetch --tags origin "${SHIM_COMMIT}"
git checkout "${SHIM_COMMIT}" git checkout "${SHIM_COMMIT}"

2
.github/workflows/release.yml vendored
View File

@@ -91,7 +91,7 @@ jobs:
id: hcsshim_commit id: hcsshim_commit
if: startsWith(matrix.os, 'windows') if: startsWith(matrix.os, 'windows')
shell: bash 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 working-directory: src/github.com/containerd/containerd
- name: Checkout hcsshim source - name: Checkout hcsshim source