feat(main): fix merge for cri and socket (#2616)

* feat(main): fix merge for cri and socket Signed-off-by: cuisongliu <cuisongliu@qq.com> * feat(main): fix merge for cri and socket Signed-off-by: cuisongliu <cuisongliu@qq.com> * feat(main): fix merge for cri and socket Signed-off-by: cuisongliu <cuisongliu@qq.com> * feat(main): fix merge for cri and socket Signed-off-by: cuisongliu <cuisongliu@qq.com> --------- Signed-off-by: cuisongliu <cuisongliu@qq.com>
labring · Feb 18, 2023 · 1d7649e · 1d7649e
1 parent 4b49779
commit 1d7649e
Show file tree

Hide file tree

Showing 10 changed files with 736 additions and 45 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,7 +41,7 @@ jobs:
 
       - name: Resolve Modules
         id: set-matrix
-        run: sh ./scripts/resolve-modules.sh
+        run: bash ./scripts/resolve-modules.sh .
 
   golangci-lint:
     needs: [resolve-modules]

diff --git a/.github/workflows/controllers.yml b/.github/workflows/controllers.yml
@@ -32,7 +32,7 @@ jobs:
 
       - name: Resolve Modules
         id: set-matrix
-        run: sh ./scripts/resolve-modules.sh ./controllers
+        run: bash ./scripts/resolve-modules.sh ./controllers
 
   golangci-lint:
     needs: [ resolve-modules ]

diff --git a/.github/workflows/services.yml b/.github/workflows/services.yml
@@ -32,7 +32,7 @@ jobs:
 
       - name: Resolve Modules
         id: set-matrix
-        run: sh ./scripts/resolve-modules.sh ./service
+        run: bash ./scripts/resolve-modules.sh ./service
 
   golangci-lint:
     needs: [  resolve-modules ]

diff --git a/.github/workflows/test_inspect.yml b/.github/workflows/test_inspect.yml
@@ -16,7 +16,7 @@ on:
       - "pkg/**"
 
 jobs:
-  verify-install:
+  build-sealos:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -27,7 +27,29 @@ jobs:
           type: install-dev
           pruneCRI: true
           autoFetch: false
-
+      - name: Save Binaries
+        uses: actions/upload-artifact@v3
+        with:
+          name: sealos
+          path: /usr/bin/sealos
+  verify-install:
+    needs: [build-sealos]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download sealos
+        uses: actions/download-artifact@v3
+        with:
+          name: sealos
+          path: /tmp/
+      - name: Verify sealos
+        run: |
+          sudo chmod a+x /tmp/sealos
+          sudo mv /tmp/sealos /usr/bin/
+          sudo sealos version
+      - name: Remove containerd && docker
+        uses: labring/sealos-action@v0.0.7
+        with:
+          type: prune
       - name: Auto install k8s using sealos
         run: |
           sudo sealos run labring/kubernetes:v1.25.0 labring/helm:v3.8.2 labring/calico:v3.24.1 --single --debug
@@ -42,19 +64,21 @@ jobs:
       
 
   verify-inspect:
+    needs: [build-sealos]
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Auto install sealos
-        uses: labring/sealos-action@v0.0.5
+      - name: Download sealos
+        uses: actions/download-artifact@v3
         with:
-          type: install-dev
-          pruneCRI: true
-          autoFetch: false
+          name: sealos
+          path: /tmp/
+      - name: Verify sealos
+        run: |
+          sudo chmod a+x /tmp/sealos
+          sudo mv /tmp/sealos /usr/bin/
+          sudo sealos version
 
       - name: Inspect
-        working-directory: test/testdata
         run: |
           sudo sealos pull labring/kubernetes:v1.23.8
           echo "test inspect local image labring/kubernetes:v1.23.8"
@@ -70,51 +94,66 @@ jobs:
           echo "test inspect docker archive alpine.tar"
           sudo sealos inspect docker-archive:$PWD/docker-alpine.tar
   verify-gen:
+    needs: [build-sealos]
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Auto install sealos
-        uses: labring/sealos-action@v0.0.5
+      - name: Download sealos
+        uses: actions/download-artifact@v3
         with:
-          type: install-dev
-          pruneCRI: true
-          autoFetch: false
+          name: sealos
+          path: /tmp/
+      - name: Verify sealos
+        run: |
+          sudo chmod a+x /tmp/sealos
+          sudo mv /tmp/sealos /usr/bin/
+          sudo sealos version
 
       - name: Inspect
         run: |
           sudo sealos gen labring/kubernetes:v1.23.8 --masters 127.0.0.1
 
   verify-run:
+    needs: [build-sealos]
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Auto install sealos
-        uses: labring/sealos-action@v0.0.5
+      - name: Download sealos
+        uses: actions/download-artifact@v3
         with:
-          type: install-dev
-          pruneCRI: true
-          autoFetch: false
-
+          name: sealos
+          path: /tmp/
+      - name: Verify sealos
+        run: |
+          sudo chmod a+x /tmp/sealos
+          sudo mv /tmp/sealos /usr/bin/
+          sudo sealos version
+      - name: Remove containerd && docker
+        uses: labring/sealos-action@v0.0.7
+        with:
+          type: prune
       - name: Run
         run: |
           sudo sealos pull labring/kubernetes:v1.25.0
           sudo sealos tag labring/kubernetes:v1.25.0 k8s:dev
           sudo sealos run  k8s:dev  labring/helm:v3.8.2 labring/calico:v3.24.1 --single --debug
 
   verify-load:
+    needs: [build-sealos]
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Auto install sealos
-        uses: labring/sealos-action@v0.0.5
+      - name: Download sealos
+        uses: actions/download-artifact@v3
         with:
-          type: install-dev
-          pruneCRI: true
-          autoFetch: false
-
+          name: sealos
+          path: /tmp/
+      - name: Verify sealos
+        run: |
+          sudo chmod a+x /tmp/sealos
+          sudo mv /tmp/sealos /usr/bin/
+          sudo sealos version
+      - name: Remove containerd && docker
+        uses: labring/sealos-action@v0.0.7
+        with:
+          type: prune
       - name: Run
         run: |
           sudo sealos pull labring/kubernetes:v1.25.0
@@ -123,4 +162,4 @@ jobs:
           sudo sealos rmi labring/kubernetes:v1.25.0
           sudo sealos rmi k8s:dev
           sudo sealos load -i k8s.tar
-          sudo sealos run  k8s:dev  labring/helm:v3.8.2 labring/calico:v3.24.1 --single --debug
+          sudo sealos run  k8s:dev  labring/helm:v3.8.2 labring/calico:v3.24.1 --single --debug