revert: Update CI versions of containerd since protos are being updated

containerd · Sep 18, 2023 · 7e35afe · 7e35afe
1 parent cbc7aee
commit 7e35afe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
@@ -19,10 +19,10 @@ jobs:
       - uses: actions/checkout@v4
       - run: ./scripts/install-protobuf.sh
       - run: cargo check --examples --tests -p containerd-shim -p containerd-shim-protos
-
+      
       - run: rustup toolchain install nightly --component rustfmt
       - run: cargo +nightly fmt -p containerd-shim -p containerd-shim-protos -- --check --files-with-diff
-
+      
       - run: cargo clippy -p containerd-shim -p containerd-shim-protos -- -D warnings
       - run: cargo doc --no-deps -p containerd-shim -p containerd-shim-protos
         env:
@@ -52,7 +52,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest]
-        containerd: [1.7.6]
+        containerd: [1.7.0]
 
     steps:
       - name: Checkout extensions
@@ -62,7 +62,7 @@ jobs:
         run: |
           $ErrorActionPreference = "Stop"
 
-          # Install containerd https://github.com/containerd/containerd/blob/v1.7.6/docs/getting-started.md#installing-containerd-on-windows
+          # Install containerd https://github.com/containerd/containerd/blob/v1.7.0/docs/getting-started.md#installing-containerd-on-windows
           # Download and extract desired containerd Windows binaries
           curl.exe -L https://github.com/containerd/containerd/releases/download/v${{ matrix.containerd }}/containerd-${{ matrix.containerd }}-windows-amd64.tar.gz -o containerd-windows-amd64.tar.gz
           tar.exe xvf .\containerd-windows-amd64.tar.gz
@@ -87,11 +87,11 @@ jobs:
           $ErrorActionPreference = "Stop"
 
           get-service containerd
-          $env:TTRPC_ADDRESS="\\.\pipe\containerd-containerd.ttrpc"
+          $env:TTRPC_ADDRESS="\\.\pipe\containerd-containerd.ttrpc"  
 
-          # run the example
-          cargo run -p containerd-shim --example skeleton -- -namespace default -id 1234 -address "\\.\pipe\containerd-containerd"  -publish-binary ./bin/containerd start
-          ps skeleton
+          # run the example 
+          cargo run -p containerd-shim --example skeleton -- -namespace default -id 1234 -address "\\.\pipe\containerd-containerd"  -publish-binary ./bin/containerd start 
+          ps skeleton 
           cargo run -p containerd-shim-protos --example shim-proto-connect \\.\pipe\containerd-shim-17630016127144989388-pipe
           $skeleton = get-process skeleton -ErrorAction SilentlyContinue
           if ($skeleton) { exit 1 }
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -89,7 +89,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04, ubuntu-22.04]
-        containerd: [v1.6.24, v1.7.6]
+        containerd: [v1.6.21, v1.7.1]
 
     steps:
       - name: Checkout extensions