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

Merge pull request #409 from miaoyq/fix-408

Browse Source 
Update golang version to 1.9.x
This commit is contained in:
Mike Brown 2017-11-10 09:03:56 -06:00 committed by GitHub
commit b4c8efd898
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -50,7 +50,7 @@ jobs:
- make .gitvalidation - make .gitvalidation
- make verify - make verify
- make binaries - make binaries
go: 1.8.x go: 1.9.x
- script: - script:
- make install.tools - make install.tools
- make .gitvalidation - make .gitvalidation
@ -69,18 +69,18 @@ jobs:
- cat /tmp/test-integration/containerd.log - cat /tmp/test-integration/containerd.log
- 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.8.x go: 1.9.x
- stage: E2E Test - stage: E2E Test
script: script:
# Skip node e2e test for pull request. # Skip node e2e test for pull request.
- test "${TRAVIS_PULL_REQUEST}" != "false" && exit 0 || true - test "${TRAVIS_PULL_REQUEST}" != "false" && exit 0 || true
- make install.deps - make install.deps
- UPLOAD_LOG=true make test-e2e-node - UPLOAD_LOG=true make test-e2e-node
go: 1.8.x go: 1.9.x
- stage: Deploy - stage: Deploy
script: script:
- test "${TRAVIS_PULL_REQUEST}" != "false" && exit 0 || true - test "${TRAVIS_PULL_REQUEST}" != "false" && exit 0 || true
- make push - make push
# Build a tarball including CNI. # Build a tarball including CNI.
- PUSH_VERSION=true make push TARBALL_PREFIX=cri-containerd-cni INCLUDE_CNI=true - PUSH_VERSION=true make push TARBALL_PREFIX=cri-containerd-cni INCLUDE_CNI=true
go: 1.8.x go: 1.9.x

2
README.md
View File

@ -48,7 +48,7 @@ backport version of `libsecomp-dev` is required. See [travis.yml](.travis.yml) f
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.8.x development environment. 3. Install and setup a go 1.9.x 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