Merge pull request #348 from bergwolf/1.11.2-branch-bump

# Kata Containers 1.11.2
release: Kata Containers 1.11.2
2026-03-01 10:12:20 +00:00 · 2020-07-01 09:39:38 -07:00 · 2020-06-29 03:14:22 +00:00 · 2020-06-05 17:38:08 -05:00 · 2020-06-05 15:43:17 +00:00 · 2020-05-08 13:17:37 -05:00
9 changed files with 26 additions and 70 deletions
--- a/.github/workflows/PR-wip-checks.yaml
+++ b/.github/workflows/PR-wip-checks.yaml
@@ -1,21 +0,0 @@
-name: Pull request WIP checks
-on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - edited
-      - labeled
-      - unlabeled
-
-jobs:
-  pr_wip_check:
-    runs-on: ubuntu-latest
-    name: WIP Check
-    steps:
-    - name: WIP Check
-      uses: tim-actions/wip-check@1c2a1ca6c110026b3e2297bb2ef39e1747b5a755
-      with:
-        labels: '["do-not-merge", "wip", "rfc"]'
-        keywords: '["WIP", "wip", "RFC", "rfc", "dnm", "DNM", "do-not-merge"]'
--- a/.github/workflows/dco-check.yaml
+++ b/.github/workflows/dco-check.yaml
@@ -1,22 +0,0 @@
-name: DCO check
-on: 
-  pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
-
-jobs:
-  dco_check_job:
-    runs-on: ubuntu-latest
-    name: DCO Check
-    steps:
-    - name: Get PR Commits
-      id: 'get-pr-commits'
-      uses: tim-actions/get-pr-commits@ed97a21c3f83c3417e67a4733ea76887293a2c8f
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-    - name: DCO Check
-      uses: tim-actions/dco@2fd0504dc0d27b33f542867c300c60840c6dcb20
-      with:
-        commits: ${{ steps.get-pr-commits.outputs.commits }}
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -39,9 +39,9 @@ jobs:
        run: |
         if grep -q $buildstr ./artifact-list/artifact-list.txt; then
           $GITHUB_WORKSPACE/.github/workflows/generate-artifact-tarball.sh $buildstr
-           echo "artifact-built=true" >> $GITHUB_ENV
+           echo ::set-env name=artifact-built::true
         else
-           echo "artifact-built=false" >> $GITHUB_ENV
+           echo ::set-env name=artifact-built::false
         fi
      - name: store-artifacts
        if: env.artifact-built == 'true'
@@ -67,9 +67,9 @@ jobs:
        run: |
         if grep -q $buildstr ./artifact-list/artifact-list.txt; then
           $GITHUB_WORKSPACE/.github/workflows/generate-artifact-tarball.sh $buildstr
-           echo "artifact-built=true" >> $GITHUB_ENV
+           echo ::set-env name=artifact-built::true
         else
-           echo "artifact-built=false" >> $GITHUB_ENV
+           echo ::set-env name=artifact-built::false
         fi
      - name: store-artifacts
        if: env.artifact-built == 'true'
@@ -93,9 +93,9 @@ jobs:
        run: |
         if grep -q $buildstr ./artifact-list/artifact-list.txt; then
           $GITHUB_WORKSPACE/.github/workflows/generate-artifact-tarball.sh $buildstr
-           echo "artifact-built=true" >> $GITHUB_ENV
+           echo ::set-env name=artifact-built::true
         else
-           echo "artifact-built=false" >> $GITHUB_ENV
+           echo ::set-env name=artifact-built::false
         fi
      - name: store-artifacts
        if: env.artifact-built == 'true'
@@ -119,9 +119,9 @@ jobs:
        run: |
         if grep -q $buildstr ./artifact-list/artifact-list.txt; then
           $GITHUB_WORKSPACE/.github/workflows/generate-artifact-tarball.sh $buildstr
-           echo "artifact-built=true" >> $GITHUB_ENV
+           echo ::set-env name=artifact-built::true
         else
-           echo "artifact-built=false" >> $GITHUB_ENV
+           echo ::set-env name=artifact-built::false
         fi
      - name: store-artifacts
        if: env.artifact-built == 'true'
@@ -146,9 +146,9 @@ jobs:
        run: |
         if grep -q $buildstr ./artifact-list/artifact-list.txt; then
           $GITHUB_WORKSPACE/.github/workflows/generate-artifact-tarball.sh $buildstr
-           echo "artifact-built=true" >> $GITHUB_ENV
+           echo ::set-env name=artifact-built::true
         else
-           echo "artifact-built=false" >> $GITHUB_ENV
+           echo ::set-env name=artifact-built::false
         fi
      - name: store-artifacts
        if: env.artifact-built == 'true'
@@ -173,9 +173,9 @@ jobs:
        run: |
         if grep -q $buildstr ./artifact-list/artifact-list.txt; then
           $GITHUB_WORKSPACE/.github/workflows/generate-artifact-tarball.sh $buildstr
-           echo "artifact-built=true" >> $GITHUB_ENV
+           echo ::set-env name=artifact-built::true
         else
-           echo "artifact-built=false" >> $GITHUB_ENV
+           echo ::set-env name=artifact-built::false
         fi
      - name: store-artifacts
        if: env.artifact-built == 'true'
@@ -200,9 +200,9 @@ jobs:
        run: |
         if grep -q $buildstr ./artifact-list/artifact-list.txt; then
           $GITHUB_WORKSPACE/.github/workflows/generate-artifact-tarball.sh $buildstr
-           echo "artifact-built=true" >> $GITHUB_ENV
+           echo ::set-env name=artifact-built::true
         else
-           echo "artifact-built=false" >> $GITHUB_ENV
+           echo ::set-env name=artifact-built::false
         fi
      - name: store-artifacts
        if: env.artifact-built == 'true'
@@ -227,9 +227,9 @@ jobs:
        run: |
         if grep -q $buildstr ./artifact-list/artifact-list.txt; then
           $GITHUB_WORKSPACE/.github/workflows/generate-artifact-tarball.sh $buildstr
-           echo "artifact-built=true" >> $GITHUB_ENV
+           echo ::set-env name=artifact-built::true
         else
-           echo "artifact-built=false" >> $GITHUB_ENV
+           echo ::set-env name=artifact-built::false
         fi
      - name: store-artifacts
        if: env.artifact-built == 'true'
@@ -254,9 +254,9 @@ jobs:
        run: |
         if grep -q $buildstr ./artifact-list/artifact-list.txt; then
           $GITHUB_WORKSPACE/.github/workflows/generate-artifact-tarball.sh $buildstr
-           echo "artifact-built=true" >> $GITHUB_ENV
+           echo ::set-env name=artifact-built::true
         else
-           echo "artifact-built=false" >> $GITHUB_ENV
+           echo ::set-env name=artifact-built::false
         fi
      - name: store-artifacts
        if: env.artifact-built == 'true'
@@ -304,7 +304,9 @@ jobs:
          docker build --build-arg KATA_ARTIFACTS=kata-static.tar.xz -t katadocker/kata-deploy-ci:$pkg_sha ./packaging/kata-deploy
          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
          docker push katadocker/kata-deploy-ci:$pkg_sha
-          echo "::set-output name=PKG_SHA::${pkg_sha}"
+
+          echo "##[set-output name=PKG_SHA;]${pkg_sha}"
+          echo ::set-env name=TAG::$tag
      - name: test-kata-deploy-ci-in-aks
        uses: ./packaging/kata-deploy/action
        with:
--- a/2
+++ b/2
@@ -1 +1 @@
-1.12.1
+1.11.2
--- a/src/agent/Cargo.toml
+++ b/src/agent/Cargo.toml
@@ -13,7 +13,7 @@ netlink = { path = "netlink" }
 lazy_static = "1.3.0"
 error-chain = "0.12.1"
 grpcio = { git="https://github.com/alipay/grpc-rs", branch="rust_agent" }
-protobuf = "=2.6.1"
+protobuf = "2.6.1"
 futures = "0.1.27"
 libc = "0.2.58"
 nix = "0.17.0"
--- a/src/agent/Makefile
+++ b/src/agent/Makefile
@@ -72,9 +72,6 @@ default: $(TARGET) show-header
 $(TARGET): $(TARGET_PATH)

 $(TARGET_PATH): $(SOURCES) | show-summary
-	@rustup default 1.42.0
-	@rustup toolchain install 1.42.0-musl
-	@rustup target add $(ARCH)-unknown-linux-musl
 	@cargo build --target $(TRIPLE)

 show-header:
--- a/src/agent/netlink/Cargo.toml
+++ b/src/agent/netlink/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 [dependencies]
 libc = "0.2.58"
 nix = "0.17.0"
-protobuf = "=2.6.1"
+protobuf = "2.6.1"
 rustjail = { path = "../rustjail" }
 protocols = { path = "../protocols" }
 slog = { version = "2.5.2", features = ["dynamic-keys", "max_level_trace", "release_max_level_info"] }
--- a/src/agent/protocols/Cargo.toml
+++ b/src/agent/protocols/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2018"

 [dependencies]
 grpcio = { git="https://github.com/alipay/grpc-rs", branch="rust_agent" }
-protobuf = "=2.6.1"
+protobuf = "2.6.1"
 futures = "0.1.27"
--- a/src/agent/rustjail/Cargo.toml
+++ b/src/agent/rustjail/Cargo.toml
@@ -17,7 +17,7 @@ scopeguard = "1.0.0"
 prctl = "1.0.0"
 lazy_static = "1.3.0"
 libc = "0.2.58"
-protobuf = "=2.6.1"
+protobuf = "2.6.1"
 slog = "2.5.2"
 slog-scope = "4.1.2"
 scan_fmt = "0.2"
Author	SHA1	Message	Date
Archana Shinde	156e3bca9b	Merge pull request #348 from bergwolf/1.11.2-branch-bump # Kata Containers 1.11.2	2020-07-01 09:39:38 -07:00
Peng Tao	7b09bcf5a3	release: Kata Containers 1.11.2 Version bump no changes Signed-off-by: Peng Tao <bergwolf@hyper.sh>	2020-06-29 03:14:22 +00:00
Salvador Fuentes	845ce4a727	Merge pull request #273 from amshinde/1.11.1-branch-bump # Kata Containers 1.11.1	2020-06-05 17:38:08 -05:00
Archana Shinde	3355510feb	release: Kata Containers 1.11.1 Version bump no changes Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>	2020-06-05 15:43:17 +00:00
Jose Carlos Venegas Munoz	71d25d530e	Merge pull request #217 from jcvenegas/backport-release-fix backport: release: actions: pin artifact to v1	2020-05-08 13:17:37 -05:00
Jose Carlos Venegas Munoz	55a004e6de	release: actions: pin artifact to v1 the actions upload/download-artifact moved to a new version and master now is not comptible. Fixes: #211 Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>	2020-05-08 17:18:50 +00:00
Jose Carlos Venegas Munoz	449236f7cd	Merge pull request #207 from katabuilder/1.11.0-branch-bump # Kata Containers 1.11.0	2020-05-06 11:55:58 -05:00
katabuilder	92a0f7a0b1	release: Kata Containers 1.11.0 Version bump no changes Signed-off-by: katabuilder <katabuilder@katacontainers.io>	2020-05-05 20:13:35 +00:00
@@ -1 +1 @@
 .12.1
 .11.2