From 819ac05f34d7852955d911c281a1075660b941e7 Mon Sep 17 00:00:00 2001 From: Shengjing Zhu Date: Sun, 22 Nov 2020 00:55:44 +0800 Subject: [PATCH] Fix hcsshim commit detection Hack with space in grep, so it won't match github.com/Microsoft/hcsshim/test Signed-off-by: Shengjing Zhu --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eea258566..6002a068d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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}" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9f08a04c0..fd5b6c859 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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