Skip to content

Commit 2c2dd59

Browse files
mikebrowmikebrow
authored
Merge branch 'master' into update-config-syntax
2 parents ef7f327 + b3678dd commit 2c2dd59

1,681 files changed

Lines changed: 144982 additions & 140092 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ environment:
1010
CGO_ENABLED: 1
1111
GO111MODULE: off
1212
matrix:
13-
- GO_VERSION: 1.13.4
13+
- GO_VERSION: 1.13.15
1414

1515
install:
1616
# Install Mingw

‎.github/workflows/ci.yml‎

Lines changed: 177 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,177 @@
1+
name: CI
2+
on: [push, pull_request]
3+
4+
jobs:
5+
#
6+
# Project checks
7+
#
8+
project:
9+
name: Project Checks (DCO, Headers, Vendor)
10+
runs-on: ubuntu-18.04
11+
timeout-minutes: 5
12+
13+
steps:
14+
- name: Install Go
15+
uses: actions/setup-go@v1
16+
with:
17+
go-version: '1.13.15'
18+
19+
- name: Set env
20+
shell: bash
21+
run: |
22+
echo "::set-env name=GOPATH::${{ github.workspace }}"
23+
echo "::add-path::${{ github.workspace }}/bin"
24+
25+
- name: Checkout cri repo
26+
uses: actions/checkout@v2
27+
with:
28+
path: ${{github.workspace}}/src/github.com/containerd/cri
29+
fetch-depth: 150
30+
31+
- name: Checkout project repo
32+
uses: actions/checkout@v2
33+
with:
34+
repository: containerd/project
35+
path: src/github.com/containerd/project
36+
37+
#
38+
# Go get dependencies
39+
#
40+
- name: Install go get dependencies
41+
env:
42+
GO111MODULE: off
43+
run: |
44+
go get -u github.com/vbatts/git-validation
45+
go get -u github.com/kunalkushwaha/ltag
46+
go get -u github.com/LK4D4/vndr
47+
48+
#
49+
# DCO / File headers / Vendor directory validation
50+
#
51+
- name: DCO
52+
env:
53+
GITHUB_COMMIT_URL: ${{ github.event.pull_request.commits_url }}
54+
DCO_VERBOSITY: "-v"
55+
DCO_RANGE: ""
56+
working-directory: src/github.com/containerd/cri
57+
run: |
58+
set -x
59+
if [ -z "${GITHUB_COMMIT_URL}" ]; then
60+
DCO_RANGE=$(jq -r '.after + "..HEAD"' ${GITHUB_EVENT_PATH})
61+
else
62+
DCO_RANGE=$(curl ${GITHUB_COMMIT_URL} | jq -r '.[0].parents[0].sha +".."+ .[-1].sha')
63+
fi
64+
../project/script/validate/dco
65+
66+
- name: Headers
67+
working-directory: src/github.com/containerd/cri
68+
run: |
69+
ltag -t "../project/script/validate/template" --check -v
70+
71+
- name: Vendor
72+
working-directory: src/github.com/containerd/cri
73+
run: ../project/script/validate/vendor
74+
75+
#
76+
# build, unit, integration, and CRI tests
77+
#
78+
linux-build-and-test:
79+
name: Build, Unit, Integration, and CRI (linux amd64)
80+
runs-on: ubuntu-18.04
81+
steps:
82+
- name: Install Go
83+
uses: actions/setup-go@v1
84+
with:
85+
go-version: '1.13.15'
86+
87+
- name: Set env
88+
shell: bash
89+
run: |
90+
echo "::set-env name=GOPATH::${{ github.workspace }}"
91+
echo "::add-path::${{ github.workspace }}/bin"
92+
93+
- name: Checkout cri repo
94+
uses: actions/checkout@v2
95+
with:
96+
path: ${{github.workspace}}/src/github.com/containerd/cri
97+
fetch-depth: 150
98+
99+
- name: Before install
100+
run: |
101+
sudo sysctl net.ipv6.conf.all.disable_ipv6=0
102+
103+
- name: Install dependencies
104+
run: |
105+
sudo apt-get update
106+
sudo apt-get install -y \
107+
btrfs-tools \
108+
libseccomp2 \
109+
libseccomp-dev
110+
make install.deps
111+
working-directory: ${{github.workspace}}/src/github.com/containerd/cri
112+
113+
- name: Install containerd
114+
run: |
115+
make containerd
116+
sudo PATH=$PATH GOPATH=$GOPATH make install-containerd
117+
working-directory: ${{github.workspace}}/src/github.com/containerd/cri
118+
119+
- name: Unit Test
120+
run: |
121+
make test
122+
working-directory: ${{github.workspace}}/src/github.com/containerd/cri
123+
124+
- name: Integration Test
125+
run: |
126+
make test-integration
127+
working-directory: ${{github.workspace}}/src/github.com/containerd/cri
128+
129+
- name: Upload Integration Log File
130+
uses: actions/upload-artifact@v1
131+
with:
132+
name: integration-test-${{github.sha}}.log
133+
path: /tmp/test-integration/containerd.log
134+
135+
- name: CRI Test
136+
run: |
137+
make test-cri
138+
working-directory: ${{github.workspace}}/src/github.com/containerd/cri
139+
140+
- name: Upload CRI Test log file
141+
uses: actions/upload-artifact@v1
142+
with:
143+
name: cri-test-${{github.sha}}.log
144+
path: /tmp/test-cri/containerd.log
145+
146+
test-windows:
147+
name: Build and CRI Test (Windows amd64)
148+
runs-on: windows-2016
149+
steps:
150+
- name: Set up Go 1.13.15
151+
uses: actions/setup-go@v1
152+
with:
153+
go-version: 1.13.15
154+
155+
- name: Checkout cri repo
156+
uses: actions/checkout@v2
157+
with:
158+
path: ${{github.workspace}}\\src\\github.com\\containerd\\cri
159+
160+
- name: Clone containerd repo
161+
run: |
162+
bash.exe -c "GO111MODULE=off go get github.com/containerd/containerd"
163+
164+
- name: Configure Windows environment variables
165+
run: |
166+
echo "::set-env name=GOPATH::$env:GITHUB_WORKSPACE"
167+
168+
- name: Build
169+
run: |
170+
bash.exe -c "pwd && ./test/windows/test.sh"
171+
working-directory: ${{github.workspace}}\\src\\github.com\\containerd\\cri
172+
173+
- name: Upload containerd log file
174+
uses: actions/upload-artifact@v1
175+
with:
176+
name: cadvisor-${{github.sha}}.log
177+
path: c:\\_artifacts\\containerd.log

‎.travis.yml‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎CONTRIBUTING.md‎

Lines changed: 0 additions & 118 deletions
This file was deleted.

0 commit comments

Comments
 (0)