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

Merge pull request #629 from mikebrow/golang-version-change

Browse Source 
moving to go1.10 only
This commit is contained in:
Lantao Liu 2018-02-28 13:21:28 -08:00 committed by GitHub
commit 30b840d620
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
.travis.yml
View File

@ -28,12 +28,6 @@ before_script:
jobs: jobs:
include: include:
- stage: Build - stage: Build
script:
- make install.tools
- make .gitvalidation
- make binaries
- make containerd
go: "1.9.x"
- script: - script:
- make install.tools - make install.tools
- make .gitvalidation - make .gitvalidation
@ -41,18 +35,6 @@ jobs:
- make containerd - make containerd
go: "1.10" go: "1.10"
- stage: Test - stage: Test
script:
- make install.deps
- make test
- make test-integration
- make test-cri
after_script:
# Abuse travis to preserve the log.
- cat /tmp/test-integration/cri-containerd.log
- cat /tmp/test-integration/containerd.log
- cat /tmp/test-cri/cri-containerd.log
- cat /tmp/test-cri/containerd.log
go: "1.9.x"
- script: - script:
- make install.deps - make install.deps
- make test - make test
@ -65,17 +47,6 @@ jobs:
- cat /tmp/test-cri/cri-containerd.log - cat /tmp/test-cri/cri-containerd.log
- cat /tmp/test-cri/containerd.log - cat /tmp/test-cri/containerd.log
go: "1.10" go: "1.10"
- script:
- make install.deps
- make containerd
- sudo make install-containerd
- make test-integration STANDALONE_CRI_CONTAINERD=false
- make test-cri STANDALONE_CRI_CONTAINERD=false
after_script:
# Abuse travis to preserve the log.
- cat /tmp/test-integration/containerd.log
- cat /tmp/test-cri/containerd.log
go: "1.9.x"
- script: - script:
- make install.deps - make install.deps
- make containerd - make containerd

2
README.md
View File

@ -59,7 +59,7 @@ backport version of `libseccomp-dev` is required. See [travis.yml](.travis.yml)
2. Install other dependencies: 2. Install other dependencies:
* **`nsenter`**: Required by CNI and portforward. * **`nsenter`**: Required by CNI and portforward.
* **`socat`**: Required by portforward. * **`socat`**: Required by portforward.
3. Install and setup a go 1.9.x development environment. 3. Install and setup a go 1.10 development environment.
4. Make a local clone of this repository. 4. Make a local clone of this repository.
5. Install binary dependencies by running the following command from your cloned `cri-containerd/` project directory: 5. Install binary dependencies by running the following command from your cloned `cri-containerd/` project directory:
```bash ```bash