Skip to content

Commit caad53d

Browse files
authored
Merge pull request #4624 from dmcgowan/update-github-ci
Enable project checks
2 parents cd2d351 + f12e909 commit caad53d

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
with:
3939
version: v1.29
4040
working-directory: src/github.com/containerd/containerd
41+
args: --timeout=5m
4142

4243
#
4344
# Project checks
@@ -104,9 +105,7 @@ jobs:
104105
else
105106
DCO_RANGE=$(curl ${GITHUB_COMMIT_URL} | jq -r '.[0].parents[0].sha + "..HEAD"')
106107
fi
107-
# Add back after CRI merge complete and remove last call
108-
# ../project/script/validate/dco
109-
echo "skipping for CRI merge since older commits may not pass this check"
108+
../project/script/validate/dco
110109
111110
- name: Headers
112111
run: ../project/script/validate/fileheader ../project/

0 commit comments

Comments
 (0)