Merge pull request #633 from egernst/1.12.0-alpha1-branch-bump

# Kata Containers 1.12.0-alpha1
release: Kata Containers 1.12.0-alpha1
2026-03-01 10:12:20 +00:00 · 2020-09-01 10:24:43 -05:00 · 2020-08-31 15:24:47 -07:00 · 2020-07-23 12:02:19 -07:00 · 2020-07-22 18:40:15 -07:00 · 2020-07-22 12:25:52 -07:00
8 changed files with 51 additions and 5 deletions
--- a/.github/workflows/PR-wip-checks.yaml
+++ b/.github/workflows/PR-wip-checks.yaml
@@ -0,0 +1,21 @@
+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
@@ -0,0 +1,22 @@
+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/2
+++ b/2
@@ -1 +1 @@
-1.11.2
+1.12.0-alpha1
--- 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,6 +72,9 @@ 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
Salvador Fuentes	5f1a9d28ea	Merge pull request #633 from egernst/1.12.0-alpha1-branch-bump # Kata Containers 1.12.0-alpha1	2020-09-01 10:24:43 -05:00
Eric Ernst	a662908478	release: Kata Containers 1.12.0-alpha1 - actions: Pin to a particular sha for actions - actions: Add action to perform checks for pull requests `57b64f35` actions: Pin to a particular sha for actions `1b157e50` actions: Add github actions to perform DCO check `0d96145c` actions: Add action to perform WIP check for pull requests Signed-off-by: Eric Ernst <eric.g.ernst@gmail.com>	2020-08-31 15:24:47 -07:00
Archana Shinde	e357dd3ca9	Merge pull request #442 from amshinde/add-wip-action actions: Pin to a particular sha for actions	2020-07-23 12:02:19 -07:00
Archana Shinde	57b64f35e0	actions: Pin to a particular sha for actions Since actions can access the github token, lets use a particular version of sha rather than using master. Fixes: #437 Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>	2020-07-22 18:40:15 -07:00
Archana Shinde	4c004891b5	Merge pull request #438 from amshinde/add-wip-action actions: Add action to perform checks for pull requests	2020-07-22 12:25:52 -07:00
Archana Shinde	1b157e5015	actions: Add github actions to perform DCO check Action performs a check to verify PR raised has commits that are signed-off. Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>	2020-07-21 17:50:14 -07:00
Archana Shinde	0d96145c29	actions: Add action to perform WIP check for pull requests Use github actions for performing WIP checks on PRs. The action checks for keywords in subject line as well labels. Fixes: #437 Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>	2020-07-21 17:50:14 -07:00
Peng Tao	c2539b1b3d	Merge pull request #350 from bergwolf/1.12.0-alpha0-branch-bump # Kata Containers 1.12.0-alpha0	2020-07-02 12:00:22 +08:00
Peng Tao	8af8129a1a	release: Kata Containers 1.12.0-alpha0 - agent: fix protobuf depenedency - ci: install rust back to 1.42.0 to avoid ci failure. - release: actions: pin artifact to v1 `1f21947d` agent: fix protobuf depenedency `ba3078b8` ci: install rust back to 1.42.0 to avoid ci failure. `bf567135` release: actions: pin artifact to v1 Signed-off-by: Peng Tao <bergwolf@hyper.sh>	2020-07-02 10:41:09 +08:00
Peng Tao	1f21947dd1	agent: fix protobuf depenedency So that we don't use the latest one that requires unstable rust features. Signed-off-by: Peng Tao <bergwolf@hyper.sh>	2020-07-02 10:40:13 +08:00
James O. D. Hunt	e902aeb5cf	Merge pull request #221 from jongwu/cargo ci: install rust back to 1.42.0 to avoid ci failure.	2020-05-21 14:06:33 +01:00
Jianyong Wu	ba3078b8e5	ci: install rust back to 1.42.0 to avoid ci failure. There maybe a bug in the 1.43.1 cargo, so we need install rust back to 1.42.0 to avoid the failure when make the rust agent using the latest rust. Fixes: #202 Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>	2020-05-19 10:14:23 +08:00
Jose Carlos Venegas Munoz	a276da6194	Merge pull request #212 from jcvenegas/fix-211 release: actions: pin artifact to v1	2020-05-07 10:28:19 -05:00
Jose Carlos Venegas Munoz	bf5671357e	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-07 03:48:03 +00:00