ci: upgrade validation workflow

Signed-off-by: mikeee <[email protected]>
dapr · Jun 20, 2024 · 01e1668 · 01e1668
1 parent 5dbfee5
commit 01e1668
Show file tree

Hide file tree

Showing 6 changed files with 109 additions and 23 deletions.
diff --git a/.github/workflows/validate-examples/details.json b/.github/workflows/validate-examples/details.json
@@ -0,0 +1,9 @@
+{
+  "daprd": "0.0.0-dev",
+  "dashboard": "0.0.0-dev",
+  "cli": "0.0.0-dev",
+  "daprBinarySubDir": "dist",
+  "dockerImageSubDir": "docker",
+  "daprImageName": "daprio/dapr:0.0.0-dev",
+  "daprImageFileName": "daprio-dapr-0.0.0-dev.tar.gz"
+}
diff --git a/.github/workflows/validate_examples.yaml b/.github/workflows/validate_examples.yaml
@@ -100,9 +100,9 @@ jobs:
         run: |
           cd cli
           make
-          echo "artifactPath=$HOME/artifacts/$GITHUB_SHA" >> $GITHUB_ENV
+          echo "artifactPath=~/artifacts/$GITHUB_SHA/" >> $GITHUB_ENV
           mkdir -p $HOME/artifacts/$GITHUB_SHA/
-          sudo cp dist/linux_amd64/release/dapr $artifactpath/dapr
+          cp dist/linux_amd64/release/dapr $HOME/artifacts/$GITHUB_SHA/dapr
           CLI_VERSION=edge
           echo "DAPR_CLI_VER=$CLI_VERSION" >> $GITHUB_ENV
 
@@ -111,16 +111,61 @@ jobs:
         run: |
           cd dapr_runtime
           make
-          mkdir -p $HOME/artifacts/$GITHUB_SHA/
-          cp dist/linux_amd64/release/* $artifactPath
+          echo "artifactPath=~/artifacts/$GITHUB_SHA/" >> $GITHUB_ENV
           RUNTIME_VERSION=edge
           echo "DAPR_RUNTIME_VER=$RUNTIME_VERSION" >> $GITHUB_ENV
 
       - name: Build Docker Image
         if: env.DAPR_REF != ''
         run: |
+          mkdir ~/dapr_docker
           cd dapr_runtime
-          docker build --build-arg "PKG_FILES=*" -f ./docker/Dockerfile ./dist/linux_amd64/release -t daprio/dapr:edge-linux-amd64 --output type=tar,dest=$artifactPath/dapr_docker.tar
+          docker build --build-arg "PKG_FILES=*" -f ./docker/Dockerfile ./dist/linux_amd64/release -t daprio/dapr:0.0.0-dev
+
+      - name: Download Install Bundle CLI
+        if: env.DAPR_REF != '' && env.DAPR_CLI_REF == ''
+        run: |
+          mkdir -p cli/dist/linux_amd64/release
+          cd cli/dist/linux_amd64/release/
+          curl -L --remote-name https://github.com/dapr/cli/releases/download/v$DAPR_CLI_VER/dapr_linux_amd64.tar.gz
+          tar xvzf dapr_linux_amd64.tar.gz
+          ls -la
+
+      - name: Build Custom Install Bundle
+        if: env.DAPR_REF != '' && env.DAPR_CLI_REF != ''
+        run: |
+          : # Create daprbundle
+          mkdir ~/daprbundle
+
+          cp .github/workflows/validate-examples/details.json ~/daprbundle/
+
+          : # Add cli
+          cp ~/artifacts/$GITHUB_SHA/dapr ~/daprbundle/dapr
+
+          : # Zip daprd/dashboard/placement/scheduler/sentry /dist/ appending _linux_amd64 to tar.gz
+          mkdir ~/daprbundle/dist
+          cd dapr_runtime/dist/linux_amd64/release/
+          for file in $(ls -1)
+          do
+            echo "packing $file"
+            tar czvf ~/daprbundle/dist/${file}_linux_amd64.tar.gz ${file}
+          done
+
+          cd ~/daprbundle/dist/
+          curl -L --remote-name https://github.com/dapr/dashboard/releases/download/v0.14.0/dashboard_linux_amd64.tar.gz
+
+          : # Add docker image
+          mkdir ~/daprbundle/docker
+          docker save daprio/dapr:0.0.0-dev | gzip > ~/daprbundle/docker/daprio-dapr-0.0.0-dev.tar.gz
+
+          : # Bundle
+          cd ~/daprbundle
+          tar czvf $HOME/artifacts/$GITHUB_SHA/daprbundle.tar.gz .
+
+      - name: List artifacts
+        if: env.DAPR_REF != '' || env.DAPR_CLI_REF != ''
+        run: |
+          ls -la $HOME/artifacts/$GITHUB_SHA/
 
       - name: Upload dapr-artifacts
         uses: actions/upload-artifact@v4
@@ -190,24 +235,19 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: dapr-artifacts
-          path: $HOME/artifacts/$GITHUB_SHA/
+          path: ~/artifacts/${{ env.GITHUB_SHA }}
 
       - name: Display downloaded artifacts
         if: env.DAPR_CLI_VER == 'edge' || env.DAPR_RUNTIME_VER == 'edge'
         run: |
-          ls ~/artifacts/$GITHUB_SHA
+          ls -la $HOME/artifacts/$GITHUB_SHA/
 
       - name: Set up Go
         id: setup-go
         uses: actions/setup-go@v5
         with:
           go-version-file: "go.mod"
 
-      - name: Import Dapr Image (edge)
-        if: env.DAPR_RUNTIME_VER == 'edge'
-        run: |
-          cat $HOME/artifacts/$GITHUB_SHA/dapr_docker.tar | docker import - daprio/dapr:edge
-
       - name: Set up Dapr CLI
         if: env.DAPR_CLI_VER != 'edge'
         run: wget -q ${{ env.DAPR_INSTALL_URL }} -O - | /bin/bash -s ${{ env.DAPR_CLI_VER }}
@@ -216,17 +256,30 @@ jobs:
         if: env.DAPR_CLI_VER == 'edge'
         run: |
           sudo cp $HOME/artifacts/$GITHUB_SHA/dapr /usr/local/bin/dapr
+          sudo chmod +x /usr/local/bin/dapr
 
       - name: Initialize Dapr runtime ${{ env.DAPR_RUNTIME_VER }}
+        if: env.DAPR_RUNTIME_VER != 'edge'
         run: |
           dapr uninstall --all
           dapr init --runtime-version ${{ env.DAPR_RUNTIME_VER }}
 
-      - name: Override daprd with referenced commit.
+      - name: Initialize Dapr runtime EDGE
         if: env.DAPR_RUNTIME_VER == 'edge'
         run: |
-          mkdir -p $HOME/.dapr/bin/
-          cp $HOME/artifacts/$GITHUB_SHA/daprd $HOME/.dapr/bin/daprd
+          : # Unpack Bundle
+          mkdir ~/daprbundle
+          tar xvzf $HOME/artifacts/$GITHUB_SHA/daprbundle.tar.gz -C ~/daprbundle
+
+          : # Run installer
+          dapr uninstall --all
+          dapr init --from-dir ~/daprbundle/
+
+          : # Initialize redis and zipkin
+          docker run --name "dapr_redis" --restart always -d -p 6379:6379 redislabs/rejson
+          docker run --name "dapr_zipkin" --restart always -d -p 9411:9411 openzipkin/zipkin
+
+          docker ps -a
 
       - name: Set up Python ${{ env.PYTHON_VER }}
         uses: actions/setup-python@v5

diff --git a/examples/hello-world/README.md b/examples/hello-world/README.md
@@ -89,7 +89,7 @@ expected_stdout_lines:
 -->
 
 ```bash
-dapr run --app-id order-app --dapr-grpc-port 3500 --log-level error -- ./order put --id 20
+dapr run --app-id order-app --dapr-grpc-port 3500 --log-level error --resources-path ./config -- ./order put --id 20
 ```
 
 <!-- END_STEP -->
@@ -105,7 +105,7 @@ expected_stdout_lines:
 -->
 
 ```bash
-dapr run --app-id order-app --dapr-grpc-port 3500 --log-level error ./order get
+dapr run --app-id order-app --dapr-grpc-port 3500 --log-level error --resources-path ./config ./order get
 ```
 
 <!-- END_STEP -->
@@ -116,7 +116,7 @@ dapr run --app-id order-app --dapr-grpc-port 3500 --log-level error ./order get
 Alternatively, you can start a standalone Dapr runtime, and call the app from another shell:
 
 ```bash
-dapr run --app-id order-app --dapr-grpc-port 3500 --log-level error
+dapr run --app-id order-app --dapr-grpc-port 3500 --log-level error --resources-path ./config
 ```
 
 
@@ -140,7 +140,7 @@ You can run more than one app in Dapr runtime. In this example you will call `or
 Another instance of the `order` app will read the state.
 
 ```sh
-dapr run --app-id order-app --dapr-grpc-port 3500 --log-level error ./order seq
+dapr run --app-id order-app --dapr-grpc-port 3500 --log-level error --resources-path ./config ./order seq
 ```
 
 ```sh

diff --git a/examples/hello-world/config/redis.yaml b/examples/hello-world/config/redis.yaml
@@ -0,0 +1,12 @@
+apiVersion: dapr.io/v1alpha1
+kind: Component
+metadata:
+  name: statestore
+spec:
+  type: state.redis
+  version: v1
+  metadata:
+    - name: redisHost
+      value: localhost:6379
+    - name: redisPassword
+      value: ""
diff --git a/examples/socket/README.md b/examples/socket/README.md
@@ -77,7 +77,7 @@ expected_stdout_lines:
 -->
 
 ```bash
-dapr run --app-id order-app --log-level error --unix-domain-socket /tmp -- ./order put --id 20
+dapr run --app-id order-app --log-level error --resources-path ./config --unix-domain-socket /tmp -- ./order put --id 20
 ```
 
 <!-- END_STEP -->
@@ -93,15 +93,15 @@ expected_stdout_lines:
 -->
 
 ```bash
-dapr run --app-id order-app --log-level error --unix-domain-socket /tmp ./order get
+dapr run --app-id order-app --log-level error --resources-path ./config --unix-domain-socket /tmp ./order get
 ```
 
 <!-- END_STEP -->
 
 Alternatively, you can start a standalone Dapr runtime, and call the app from another shell:
 
 ```bash
-dapr run --app-id order-app --log-level error --unix-domain-socket /tmp
+dapr run --app-id order-app --log-level error --resources-path ./config --unix-domain-socket /tmp
 ```
 
 
@@ -124,7 +124,7 @@ You can run more than one app in Dapr runtime. In this example you will call `or
 Another instance of the `order` app will read the state.
 
 ```sh
-dapr run --app-id order-app --log-level error --unix-domain-socket /tmp ./order seq
+dapr run --app-id order-app --log-level error --resources-path ./config --unix-domain-socket /tmp ./order seq
 ```
 
 ```sh

diff --git a/examples/socket/config/redis.yaml b/examples/socket/config/redis.yaml
@@ -0,0 +1,12 @@
+apiVersion: dapr.io/v1alpha1
+kind: Component
+metadata:
+  name: statestore
+spec:
+  type: state.redis
+  version: v1
+  metadata:
+    - name: redisHost
+      value: localhost:6379
+    - name: redisPassword
+      value: ""