refactor build to use artifacts (#36)

* refactor build to use artifacts

Signed-off-by: jiaxiao zhou <[email protected]>
Co-authored-by: jiaxiao zhou <[email protected]>

Author: devigned

.github/workflows/build.yaml

@@ -20,15 +20,7 @@ jobs:
     env:
       ARCH: ${{ matrix.config.arch }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ./deployments/k3d/.tmp/
-            ./bin
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-cargo-
+      - uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
         with:
           workspaces: |
@@ -41,9 +33,24 @@ jobs:
       - name: build
         run: |
           make build
-          rm -rf ./bin && mkdir ./bin
-          cp containerd-shim-slight-v1/target/release/containerd-shim-*-v1 bin/
-          cp containerd-shim-spin-v1/target/release/containerd-shim-*-v1 bin/
+      - name: lowercase the runner OS name
+        shell: bash
+        run: |
+          OS=$(echo "${{ runner.os }}" | tr '[:upper:]' '[:lower:]')
+          echo "RUNNER_OS=$OS" >> $GITHUB_ENV
+      - name: package release assets
+        run: |
+          mkdir _dist
+          cp containerd-shim-slight-v1/target/${{ matrix.config.arch }}-unknown-linux-musl/release/containerd-shim-*-v1 _dist/
+          cp containerd-shim-spin-v1/target/${{ matrix.config.arch }}-unknown-linux-musl/release/containerd-shim-*-v1 _dist/
+          cd _dist
+          tar czf containerd-wasm-shims-v1-${{ env.RUNNER_OS }}-${{ matrix.config.arch }}.tar.gz containerd-shim-*-v1
+      - name: upload shim artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: containerd-wasm-shims-v1-${{ env.RUNNER_OS }}-${{ matrix.config.arch }}
+          path: _dist/containerd-wasm-shims-v1-${{ env.RUNNER_OS }}-${{ matrix.config.arch }}.tar.gz
+          retention-days: 5
       - name: build k3d demo
         run: make build-image
         working-directory: ./deployments/k3d

.github/workflows/release.yaml

@@ -6,25 +6,13 @@ on:
 jobs:
   build:
     uses: ./.github/workflows/build.yaml
-
   release:
-    strategy:
-      matrix:
-        config:
-          - {
-              os: "ubuntu-latest",
-              arch: "x86_64",
-            }
-          - {
-              os: "ubuntu-latest",
-              arch: "aarch64"
-            }
     permissions: 
       contents: write
       packages: write 
     needs: build
     if: startsWith(github.ref, 'refs/tags/v')
-    runs-on: ${{ matrix.config.os }}
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Set RELEASE_VERSION ENV var
@@ -34,36 +22,28 @@ jobs:
         run: |
           OS=$(echo "${{ runner.os }}" | tr '[:upper:]' '[:lower:]')
           echo "RUNNER_OS=$OS" >> $GITHUB_ENV
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ./deployments/k3d/.tmp/
-            ./bin
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-      - name: package release assets
-        run: |
-          mkdir _dist
-          cp bin/containerd-shim-*-v1 _dist/
-          cd _dist
-          tar czf containerd-wasm-shims-v1-${{ env.RELEASE_VERSION }}-${{ env.RUNNER_OS }}-${{ matrix.config.arch }}.tar.gz containerd-shim-*-v1
       - name: copy release workload assets into _dist
         run: |
           cp ./deployments/workloads/spin/runtime.yaml _dist/spin_runtime.yaml
           cp ./deployments/workloads/spin/workload.yaml _dist/spin_workload.yaml
           cp ./deployments/workloads/slight/runtime.yaml _dist/slight_runtime.yaml
           cp ./deployments/workloads/slight/workload.yaml _dist/slight_workload.yaml
+      - uses: actions/download-artifact@v3
+        with:
+          path: _artifacts
       - name: create release
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh release create ${{ env.RELEASE_VERSION }} \
             --generate-notes \
             -p \
-            _dist/containerd-wasm-shims-v1-${{ env.RELEASE_VERSION }}-${{ env.RUNNER_OS }}-${{ matrix.config.arch }}.tar.gz#containerd-wasm-shims-v1 \
             _dist/spin_runtime.yaml#example-spin-runtimes \
             _dist/spin_workload.yaml#example-spin-workloads \
             _dist/slight_runtime.yaml#example-slight-runtimes \
             _dist/slight_workload.yaml#example-slight-workloads
+          
+          for f in ./_artifacts/*/*.tar.gz; do gh release upload ${{ env.RELEASE_VERSION }} $f; done
       - name: setup buildx
         uses: docker/setup-buildx-action@v2
       - name: login to GitHub container registry
@@ -88,6 +68,11 @@ jobs:
             ghcr.io/deislabs/containerd-wasm-shims/examples/slight-rust-hello:${{ env.RELEASE_VERSION }}
             ghcr.io/deislabs/containerd-wasm-shims/examples/slight-rust-hello:latest
           context: images/slight
+      - name: untar x86_64 musl artifacts into ./deployments/k3d/.tmp dir
+        run: |
+          mkdir -p ./deployments/k3d/.tmp
+          tar -xf ./_artifacts/containerd-wasm-shims-v1-linux-x86_64/containerd-wasm-shims-v1-linux-x86_64.tar.gz \
+            --directory ./deployments/k3d/.tmp
       - name: build and push k3d shim image
         uses: docker/build-push-action@v3
         with:

Makefile

@@ -2,11 +2,13 @@ PREFIX ?= /usr/local
 INSTALL ?= install
 TEST_IMG_NAME_SPIN ?= wasmtest_spin:latest
 TEST_IMG_NAME_SLIGHT ?= wasmtest_slight:latest
+ARCH ?= x86_64
+TARGET ?= $(ARCH)-unknown-linux-musl
 
 CONTAINERD_NAMESPACE ?= default
 
 .PHONY: build
-build: build-spin build-slight
+build: build-spin-cross-$(TARGET) build-slight-cross-$(TARGET)
 	echo "Build complete"
 
 .PHONY: build-spin
@@ -64,4 +66,4 @@ run_slight: install load
 clean:
 	sudo rm -rf $(PREFIX)/bin/containerd-shim-spin-v1
 	sudo rm -rf $(PREFIX)/bin/containerd-shim-slight-v1
-	sudo rm -rf ./test
+	sudo rm -rf ./test