Merge pull request #1285 from egernst/holyhell-this-is-it-stable-1.12

actions: fix error with nemu build job

.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"]'

.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 }}

.github/workflows/main.yaml

@@ -17,7 +17,7 @@ jobs:
          popd
          ./packaging/artifact-list.sh > artifact-list.txt
       - name: save-artifact-list
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v1
         with:
           name: artifact-list
           path: artifact-list.txt
@@ -30,7 +30,7 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: get-artifact-list
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v1
         with:
           name: artifact-list
       - run: |
@@ -39,13 +39,13 @@ jobs:
         run: |
          if grep -q $buildstr ./artifact-list/artifact-list.txt; then
            $GITHUB_WORKSPACE/.github/workflows/generate-artifact-tarball.sh $buildstr
-           echo ::set-env name=artifact-built::true
+           echo "artifact-built=true" >> $GITHUB_ENV
          else
-           echo ::set-env name=artifact-built::false
+           echo "artifact-built=false" >> $GITHUB_ENV
          fi
       - name: store-artifacts
         if: env.artifact-built == 'true'
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v1
         with:
           name: kata-artifacts
           path: kata-static-kernel.tar.gz
@@ -58,7 +58,7 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: get-artifact-list
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v1
         with:
           name: artifact-list
       - run: |
@@ -67,13 +67,13 @@ jobs:
         run: |
          if grep -q $buildstr ./artifact-list/artifact-list.txt; then
            $GITHUB_WORKSPACE/.github/workflows/generate-artifact-tarball.sh $buildstr
-           echo ::set-env name=artifact-built::true
+           echo "artifact-built=true" >> $GITHUB_ENV
          else
-           echo ::set-env name=artifact-built::false
+           echo "artifact-built=false" >> $GITHUB_ENV
          fi
       - name: store-artifacts
         if: env.artifact-built == 'true'
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v1
         with:
           name: kata-artifacts
           path: kata-static-experimental-kernel.tar.gz
@@ -86,20 +86,20 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: get-artifact-list
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v1
         with:
           name: artifact-list
       - name: build-qemu
         run: |
          if grep -q $buildstr ./artifact-list/artifact-list.txt; then
            $GITHUB_WORKSPACE/.github/workflows/generate-artifact-tarball.sh $buildstr
-           echo ::set-env name=artifact-built::true
+           echo "artifact-built=true" >> $GITHUB_ENV
          else
-           echo ::set-env name=artifact-built::false
+           echo "artifact-built=false" >> $GITHUB_ENV
          fi
       - name: store-artifacts
         if: env.artifact-built == 'true'
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v1
         with:
           name: kata-artifacts
           path: kata-static-qemu.tar.gz
@@ -112,20 +112,20 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: get-artifact-list
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v1
         with:
           name: artifact-list
       - name: build-nemu
         run: |
          if grep -q $buildstr ./artifact-list/artifact-list.txt; then
            $GITHUB_WORKSPACE/.github/workflows/generate-artifact-tarball.sh $buildstr
-           echo ::set-env name=artifact-built::true
+           echo "artifact-built=true" >> $GITHUB_ENV
          else
-           echo ::set-env name=artifact-built::false
+           echo "artifact-built=false" >> $GITHUB_ENV
          fi
       - name: store-artifacts
         if: env.artifact-built == 'true'
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v1
         with:
           name: kata-artifacts
           path: kata-static-nemu.tar.gz
@@ -139,20 +139,20 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: get-artifact-list
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v1
         with:
           name: artifact-list
       - name: build-qemu-virtiofsd
         run: |
          if grep -q $buildstr ./artifact-list/artifact-list.txt; then
            $GITHUB_WORKSPACE/.github/workflows/generate-artifact-tarball.sh $buildstr
-           echo ::set-env name=artifact-built::true
+           echo "artifact-built=true" >> $GITHUB_ENV
          else
-           echo ::set-env name=artifact-built::false
+           echo "artifact-built=false" >> $GITHUB_ENV
          fi
       - name: store-artifacts
         if: env.artifact-built == 'true'
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v1
         with:
           name: kata-artifacts
           path: kata-static-qemu-virtiofsd.tar.gz
@@ -166,20 +166,20 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: get-artifact-list
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v1
         with:
           name: artifact-list
       - name: build-image
         run: |
          if grep -q $buildstr ./artifact-list/artifact-list.txt; then
            $GITHUB_WORKSPACE/.github/workflows/generate-artifact-tarball.sh $buildstr
-           echo ::set-env name=artifact-built::true
+           echo "artifact-built=true" >> $GITHUB_ENV
          else
-           echo ::set-env name=artifact-built::false
+           echo "artifact-built=false" >> $GITHUB_ENV
          fi
       - name: store-artifacts
         if: env.artifact-built == 'true'
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v1
         with:
           name: kata-artifacts
           path: kata-static-image.tar.gz
@@ -193,20 +193,20 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: get-artifact-list
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v1
         with:
           name: artifact-list
       - name: build-firecracker
         run: |
          if grep -q $buildstr ./artifact-list/artifact-list.txt; then
            $GITHUB_WORKSPACE/.github/workflows/generate-artifact-tarball.sh $buildstr
-           echo ::set-env name=artifact-built::true
+           echo "artifact-built=true" >> $GITHUB_ENV
          else
-           echo ::set-env name=artifact-built::false
+           echo "artifact-built=false" >> $GITHUB_ENV
          fi
       - name: store-artifacts
         if: env.artifact-built == 'true'
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v1
         with:
           name: kata-artifacts
           path: kata-static-firecracker.tar.gz
@@ -220,20 +220,20 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: get-artifact-list
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v1
         with:
           name: artifact-list
       - name: build-clh
         run: |
          if grep -q $buildstr ./artifact-list/artifact-list.txt; then
            $GITHUB_WORKSPACE/.github/workflows/generate-artifact-tarball.sh $buildstr
-           echo ::set-env name=artifact-built::true
+           echo "artifact-built=true" >> $GITHUB_ENV
          else
-           echo ::set-env name=artifact-built::false
+           echo "artifact-built=false" >> $GITHUB_ENV
          fi
       - name: store-artifacts
         if: env.artifact-built == 'true'
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v1
         with:
           name: kata-artifacts
           path: kata-static-clh.tar.gz
@@ -247,20 +247,20 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: get-artifact-list
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v1
         with:
           name: artifact-list
       - name: build-kata-components
         run: |
          if grep -q $buildstr ./artifact-list/artifact-list.txt; then
            $GITHUB_WORKSPACE/.github/workflows/generate-artifact-tarball.sh $buildstr
-           echo ::set-env name=artifact-built::true
+           echo "artifact-built=true" >> $GITHUB_ENV
          else
-           echo ::set-env name=artifact-built::false
+           echo "artifact-built=false" >> $GITHUB_ENV
          fi
       - name: store-artifacts
         if: env.artifact-built == 'true'
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v1
         with:
           name: kata-artifacts
           path: kata-static-kata-components.tar.gz
@@ -271,14 +271,14 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: get-artifacts
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v1
         with:
           name: kata-artifacts
       - name: colate-artifacts
         run: |
           $GITHUB_WORKSPACE/.github/workflows/gather-artifacts.sh
       - name: store-artifacts
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v1
         with:
           name: release-candidate
           path: kata-static.tar.xz
@@ -288,7 +288,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: get-artifacts
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v1
         with:
           name: release-candidate
       - name: build-and-push-kata-deploy-ci
@@ -304,9 +304,7 @@ 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:
@@ -329,7 +327,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: download-artifacts
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v1
         with:
           name: release-candidate
       - name: install hub

VERSION

@@ -1 +1 @@
-1.11.0-rc0
+1.12.1

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"

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:

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"] }

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"

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"