From b5d2c976f193fe4d7e2f1753dec2f4f62ea29bed Mon Sep 17 00:00:00 2001 From: hydai Date: Sun, 14 Jul 2024 14:45:18 +0800 Subject: [PATCH 1/3] Deprecated wasmedge versions <= 0.13.5, use crun 1.15 and wasmedge 0.13.5/0.14.0 instead Signed-off-by: hydai --- .github/workflows/containerd-server.yml | 4 ++-- .github/workflows/containerd.yml | 4 ++-- .github/workflows/crio-server.yml | 4 ++-- .github/workflows/crio.yml | 4 ++-- .github/workflows/kubernetes-containerd-server.yml | 4 ++-- .github/workflows/kubernetes-containerd.yml | 4 ++-- .github/workflows/kubernetes-crio-server.yml | 4 ++-- .github/workflows/kubernetes-crio.yml | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/containerd-server.yml b/.github/workflows/containerd-server.yml index e2c56da..704a507 100644 --- a/.github/workflows/containerd-server.yml +++ b/.github/workflows/containerd-server.yml @@ -27,8 +27,8 @@ jobs: strategy: fail-fast: false matrix: - crun: ["1.8.4"] - wasmedge: ["0.11.0", "0.11.1", "0.11.2", "0.12.1"] + crun: ["1.15"] + wasmedge: ["0.13.5", "0.14.0"] tag: ["latest"] latest: [false] variant: ["compat-smart"] diff --git a/.github/workflows/containerd.yml b/.github/workflows/containerd.yml index 5a5a263..6e5165b 100644 --- a/.github/workflows/containerd.yml +++ b/.github/workflows/containerd.yml @@ -27,8 +27,8 @@ jobs: strategy: fail-fast: false matrix: - crun: ["1.8.4"] - wasmedge: ["0.11.0", "0.11.1", "0.11.2", "0.12.1"] + crun: ["1.15"] + wasmedge: ["0.13.5", "0.14.0"] tag: ["latest"] latest: [false] variant: ["compat-smart"] diff --git a/.github/workflows/crio-server.yml b/.github/workflows/crio-server.yml index c402b55..22d9594 100644 --- a/.github/workflows/crio-server.yml +++ b/.github/workflows/crio-server.yml @@ -27,8 +27,8 @@ jobs: strategy: fail-fast: false matrix: - crun: ["1.8.4"] - wasmedge: ["0.11.0", "0.11.1", "0.11.2", "0.12.1"] + crun: ["1.15"] + wasmedge: ["0.13.5", "0.14.0"] tag: ["latest"] latest: [false] config: ["container_http_server.json"] diff --git a/.github/workflows/crio.yml b/.github/workflows/crio.yml index bc25701..f46681b 100644 --- a/.github/workflows/crio.yml +++ b/.github/workflows/crio.yml @@ -27,8 +27,8 @@ jobs: strategy: fail-fast: false matrix: - crun: ["1.8.4"] - wasmedge: ["0.11.0", "0.11.1", "0.11.2", "0.12.1"] + crun: ["1.15"] + wasmedge: ["0.13.5", "0.14.0"] config: ["container_wasi.json"] tag: ["latest"] latest: [false] diff --git a/.github/workflows/kubernetes-containerd-server.yml b/.github/workflows/kubernetes-containerd-server.yml index 857f4c0..affa24a 100644 --- a/.github/workflows/kubernetes-containerd-server.yml +++ b/.github/workflows/kubernetes-containerd-server.yml @@ -27,8 +27,8 @@ jobs: strategy: fail-fast: false matrix: - crun: ["1.8.4"] - wasmedge: ["0.11.0", "0.11.1", "0.11.2", "0.12.1"] + crun: ["1.15"] + wasmedge: ["0.13.5", "0.14.0"] tag: ["latest"] latest: [false] variant: ["compat-smart"] diff --git a/.github/workflows/kubernetes-containerd.yml b/.github/workflows/kubernetes-containerd.yml index 2ca0193..1cd301e 100644 --- a/.github/workflows/kubernetes-containerd.yml +++ b/.github/workflows/kubernetes-containerd.yml @@ -27,8 +27,8 @@ jobs: strategy: fail-fast: false matrix: - crun: ["1.8.4"] - wasmedge: ["0.11.0", "0.11.1", "0.11.2", "0.12.1"] + crun: ["1.15"] + wasmedge: ["0.13.5", "0.14.0"] tag: ["latest"] latest: [false] variant: ["compat-smart"] diff --git a/.github/workflows/kubernetes-crio-server.yml b/.github/workflows/kubernetes-crio-server.yml index d010ea5..d973c46 100644 --- a/.github/workflows/kubernetes-crio-server.yml +++ b/.github/workflows/kubernetes-crio-server.yml @@ -27,8 +27,8 @@ jobs: strategy: fail-fast: false matrix: - crun: ["1.8.4"] - wasmedge: ["0.11.0", "0.11.1", "0.11.2", "0.12.1"] + crun: ["1.15"] + wasmedge: ["0.13.5", "0.14.0"] latest: [false] config: ["k8s-http_server.yaml"] include: diff --git a/.github/workflows/kubernetes-crio.yml b/.github/workflows/kubernetes-crio.yml index 6f56501..5ab8cc1 100644 --- a/.github/workflows/kubernetes-crio.yml +++ b/.github/workflows/kubernetes-crio.yml @@ -27,8 +27,8 @@ jobs: strategy: fail-fast: false matrix: - crun: ["1.8.4"] - wasmedge: ["0.11.0", "0.11.1", "0.11.2", "0.12.1"] + crun: ["1.15"] + wasmedge: ["0.13.5", "0.14.0"] tag: ["latest"] latest: [false] variant: ["compat-smart"] From d7ada6d4bbfe80677b6a477b8a19995e45356b7a Mon Sep 17 00:00:00 2001 From: hydai Date: Sun, 14 Jul 2024 14:47:20 +0800 Subject: [PATCH 2/3] Bump wasi-nn example from 0.12.4 to 0.13.5 Signed-off-by: hydai --- k8s_containerd_wasi_nn/install_containerd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s_containerd_wasi_nn/install_containerd.sh b/k8s_containerd_wasi_nn/install_containerd.sh index 858892e..869141b 100644 --- a/k8s_containerd_wasi_nn/install_containerd.sh +++ b/k8s_containerd_wasi_nn/install_containerd.sh @@ -1,6 +1,6 @@ #!/bin/bash -export WASMEDGE_VERSION="0.12.1" +export WASMEDGE_VERSION="0.13.5" echo -e "Starting installation ..." sudo apt update From 1b66cd20ccbc1fef29056f71a165de24778f83d1 Mon Sep 17 00:00:00 2001 From: hydai Date: Sun, 14 Jul 2024 15:51:44 +0800 Subject: [PATCH 3/3] Bump actions/checkout from v3 to v4 Signed-off-by: hydai --- .github/workflows/containerd-server.yml | 2 +- .github/workflows/containerd.yml | 2 +- .github/workflows/crio-server.yml | 2 +- .github/workflows/crio.yml | 2 +- .github/workflows/kubernetes-containerd-llama-server.yml | 2 +- .github/workflows/kubernetes-containerd-server.yml | 2 +- .github/workflows/kubernetes-containerd-wasi-nn.yml | 2 +- .github/workflows/kubernetes-containerd.yml | 2 +- .github/workflows/kubernetes-crio-server.yml | 2 +- .github/workflows/kubernetes-crio.yml | 2 +- .github/workflows/kwasm-server.yml | 2 +- .github/workflows/kwasm.yml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/containerd-server.yml b/.github/workflows/containerd-server.yml index 704a507..0b06f16 100644 --- a/.github/workflows/containerd-server.yml +++ b/.github/workflows/containerd-server.yml @@ -43,7 +43,7 @@ jobs: name: WasmEdge:${{ matrix.wasmedge }},crun:${{ matrix.crun }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/containerd.yml b/.github/workflows/containerd.yml index 6e5165b..9dd4862 100644 --- a/.github/workflows/containerd.yml +++ b/.github/workflows/containerd.yml @@ -43,7 +43,7 @@ jobs: name: WasmEdge:${{ matrix.wasmedge }},crun:${{ matrix.crun }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/crio-server.yml b/.github/workflows/crio-server.yml index 22d9594..40c349d 100644 --- a/.github/workflows/crio-server.yml +++ b/.github/workflows/crio-server.yml @@ -43,7 +43,7 @@ jobs: name: WasmEdge:${{ matrix.wasmedge }},crun:${{ matrix.crun }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/crio.yml b/.github/workflows/crio.yml index f46681b..d574eeb 100644 --- a/.github/workflows/crio.yml +++ b/.github/workflows/crio.yml @@ -43,7 +43,7 @@ jobs: name: WasmEdge:${{ matrix.wasmedge }},crun:${{ matrix.crun }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/kubernetes-containerd-llama-server.yml b/.github/workflows/kubernetes-containerd-llama-server.yml index 0ef75b4..1bfb102 100644 --- a/.github/workflows/kubernetes-containerd-llama-server.yml +++ b/.github/workflows/kubernetes-containerd-llama-server.yml @@ -28,7 +28,7 @@ jobs: name: Run ggml plugin example steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/kubernetes-containerd-server.yml b/.github/workflows/kubernetes-containerd-server.yml index affa24a..0b28e6e 100644 --- a/.github/workflows/kubernetes-containerd-server.yml +++ b/.github/workflows/kubernetes-containerd-server.yml @@ -43,7 +43,7 @@ jobs: name: WasmEdge:${{ matrix.wasmedge }},crun:${{ matrix.crun }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/kubernetes-containerd-wasi-nn.yml b/.github/workflows/kubernetes-containerd-wasi-nn.yml index 6a1b36e..e743550 100644 --- a/.github/workflows/kubernetes-containerd-wasi-nn.yml +++ b/.github/workflows/kubernetes-containerd-wasi-nn.yml @@ -28,7 +28,7 @@ jobs: name: Run WASI-NN plugin example steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/kubernetes-containerd.yml b/.github/workflows/kubernetes-containerd.yml index 1cd301e..3d1920c 100644 --- a/.github/workflows/kubernetes-containerd.yml +++ b/.github/workflows/kubernetes-containerd.yml @@ -43,7 +43,7 @@ jobs: name: WasmEdge:${{ matrix.wasmedge }},crun:${{ matrix.crun }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/kubernetes-crio-server.yml b/.github/workflows/kubernetes-crio-server.yml index d973c46..e86941d 100644 --- a/.github/workflows/kubernetes-crio-server.yml +++ b/.github/workflows/kubernetes-crio-server.yml @@ -42,7 +42,7 @@ jobs: name: WasmEdge:${{ matrix.wasmedge }},crun:${{ matrix.crun }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/kubernetes-crio.yml b/.github/workflows/kubernetes-crio.yml index 5ab8cc1..713710b 100644 --- a/.github/workflows/kubernetes-crio.yml +++ b/.github/workflows/kubernetes-crio.yml @@ -43,7 +43,7 @@ jobs: name: WasmEdge:${{ matrix.wasmedge }},crun:${{ matrix.crun }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/kwasm-server.yml b/.github/workflows/kwasm-server.yml index 0ae9b9e..fe44095 100644 --- a/.github/workflows/kwasm-server.yml +++ b/.github/workflows/kwasm-server.yml @@ -26,7 +26,7 @@ jobs: k8s_kwasm_server: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: helm/kind-action@v1.4.0 diff --git a/.github/workflows/kwasm.yml b/.github/workflows/kwasm.yml index 4644b7c..efdd081 100644 --- a/.github/workflows/kwasm.yml +++ b/.github/workflows/kwasm.yml @@ -26,7 +26,7 @@ jobs: k8s_kwasm: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: helm/kind-action@v1.4.0