Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kata-containers/runtime
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 64bd5c263354cea8f5ff1e1213fe958581cfcf83
Choose a base ref
..
head repository: kata-containers/runtime
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 744ccd4ed206762aaea142f7a10333a5954c4d21
Choose a head ref
Showing 362 changed files with 38,063 additions and 11,545 deletions.
15 changes: 12 additions & 3 deletions .ci/versions_checker.sh
Original file line number Diff line number Diff line change
@@ -12,20 +12,29 @@
# This ensures that the rest
# of the components are merged before the runtime

set -e
set -o errexit
set -o nounset
set -o pipefail
set -o errtrace

GOPATH=${GOPATH:-${HOME}/go}

PACKAGING_REPO="github.com/kata-containers/packaging"
RUNTIME_REPO="github.com/kata-containers/runtime"
KATA_BRANCH=${target_branch:-master}

go get -d "${PACKAGING_REPO}" || true

check_changes=$(git diff "${GOPATH}/src/${RUNTIME_REPO}/VERSION")
if ! check_changes=$(git diff --name-only "origin/${KATA_BRANCH}" | grep VERSION); then
echo "No changes in VERSION file - this is not a bump - nothing to check"
exit 0
fi
version_to_check=$(cat "${GOPATH}/src/${RUNTIME_REPO}/VERSION")

if [ ! -z "$check_changes" ]; then
echo "Changes detected on VERSION"
echo "Check versions in branch ${KATA_BRANCH}"
pushd "${GOPATH}/src/${PACKAGING_REPO}"
./release/tag_repos.sh pre-release "${version_to_check}"
./release/tag_repos.sh -b "${KATA_BRANCH}" pre-release "${version_to_check}"
popd
fi
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@
/cli/config/configuration-fc.toml
/cli/config/configuration-nemu.toml
/cli/config/configuration-qemu.toml
/cli/config/configuration-qemu-virtiofs.toml
/cli/config-generated.go
/cli/coverage.html
/containerd-shim-kata-v2
13 changes: 11 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -9,16 +9,25 @@ sudo: required
dist: xenial

language: go

os:
- linux
- linux-ppc64le
- linux
- linux-ppc64le

matrix:
allow_failures:
- os: linux-ppc64le

go_import_path: github.com/kata-containers/runtime

env:
- target_branch=$TRAVIS_BRANCH

before_install:
- git remote set-branches --add origin "${TRAVIS_BRANCH}"
- git fetch
- ".ci/setup.sh"
- ".ci/versions_checker.sh"

before_script:
- ".ci/install_go.sh"
61 changes: 35 additions & 26 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 12 additions & 8 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[[constraint]]
name = "github.com/containernetworking/plugins"
revision = "7f98c94613021d8b57acfa1a2f0c8d0f6fd7ae5a"
revision = "485be65581341430f9106a194a98f0f2412245fb"

[[constraint]]
name = "github.com/go-ini/ini"
@@ -20,7 +20,7 @@

[[constraint]]
name = "github.com/opencontainers/runtime-spec"
revision = "5806c35637336642129d03657419829569abc5aa"
revision = "a1b50f621a48ad13f8f696a162f684a241307db0"

[[constraint]]
name = "github.com/stretchr/testify"
@@ -32,27 +32,27 @@

[[constraint]]
name = "github.com/vishvananda/netlink"
revision = "c2a3de3b38bd00f07290c3c5e12b4dbc04ec8666"
revision = "c8c507c80ea28385caac72b682dd066e44943913"

[[constraint]]
name = "github.com/vishvananda/netns"
revision = "86bef332bfc3b59b7624a600bd53009ce91a9829"

[[constraint]]
name = "golang.org/x/sys"
revision = "1d2aa6dbdea45adaaebb9905d0666e4537563829"
revision = "88d2dcc510266da9f7f8c7f34e1940716cab5f5c"

[[constraint]]
name = "github.com/sirupsen/logrus"
revision = "89742aefa4b206dcf400792f3bd35b542998eb3b"

[[constraint]]
name = "github.com/intel/govmm"
revision = "e0505242c0670f1a522f5b2d827e4a7e4062a14d"
revision = "8cba5a8e5f2816f26f9dc34b8ea968279a5a76eb"

[[constraint]]
name = "github.com/kata-containers/agent"
revision = "48dd1c031530fce9bf16b0f6a7305979cedd8fc9"
revision = "32c87e75c2e4c014961f104c3c59b87f2aee3384"

[[constraint]]
name = "github.com/containerd/cri-containerd"
@@ -68,7 +68,11 @@

[[constraint]]
name = "github.com/gogo/protobuf"
revision = "342cbe0a04158f6dcb03ca0079991a51a4248c02"
revision = "4cbf7e384e768b4e01799441fdf2a706a5635ae7"

[[override]]
name = "github.com/containerd/ttrpc"
revision = "92c8520ef9f86600c650dd540266a007bf03670f"

[[override]]
branch = "master"
@@ -80,7 +84,7 @@
unused-packages = true

[[constraint]]
revision = "5017d4e9a9cf2d4381db99eacd9baf84b95bfb14"
revision = "c4b9ac5c7601384c965b9646fc515884e091ebb9"
name = "github.com/containerd/cgroups"

[[constraint]]
Loading