fix gh ci

alauda · Nov 15, 2024 · a28946a · a28946a
1 parent 4322cad
commit a28946a
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 3 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -39,6 +39,9 @@ jobs:
   build-alb:
     name: Build alb
     runs-on: ubuntu-22.04
+    outputs:
+      go-coverage: ${{ steps.go-coverage.outputs.coverage }}
+      lua-coverage: ${{ steps.go-coverage.outputs.coverage }}
     strategy:
       matrix:
         platform:
@@ -105,6 +108,11 @@ jobs:
         run: |
           set -x
           ./scripts/run-like-github-actions.sh test-alb-nginx
+          echo "in gh ci"
+          cat ./luacov.summary
+          line_cov=$(cat ./luacov.summary |grep Total|awk '{print $4}'|awk -F% '{print $1}')
+          echo "lua coverage is $line_cov%"
+          echo "LUA_COVERAGE=$luacov" >> $GITHUB_OUT
   release-alb:
     name: Release alb
     runs-on: ubuntu-22.04
@@ -170,4 +178,17 @@ jobs:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
           DOCKER_CLI_EXPERIMENTAL: enabled
         run: |
-           ./scripts/run-like-github-actions.sh release-alb
+           ./scripts/run-like-github-actions.sh release-alb
+  update-coverage:
+    name: update coverage
+    runs-on: ubuntu-22.04
+    needs: [build-alb, release-alb]
+    env:
+      GO_COVERAGE: ${{ needs.build-alb.outputs.go-coverage }}
+      LUA_COVERAGE: ${{ needs.build-alb.outputs.lua-coverage }}
+    steps:
+      - name: debug
+        run: |
+          env
+          echo "GO_COVERAGE=$GO_COVERAGE"
+          echo "LUA_COVERAGE=$LUA_COVERAGE"
diff --git a/scripts/run-like-ci-nginx.sh b/scripts/run-like-ci-nginx.sh
@@ -11,3 +11,4 @@ fi
 platform=${MATRIX_PLATFORM:-linux/amd64}
 echo "platform $platform"
 docker run --user root --network=host --platform $platform -v $PWD:/acp-alb-test -t $image sh -c 'cd /acp-alb-test ;/acp-alb-test/scripts/nginx-test.sh'
+# docker run --user root --network=host --platform $platform -v $PWD:/acp-alb-test -it $image sh
diff --git a/scripts/run-like-github-actions.sh b/scripts/run-like-github-actions.sh
@@ -19,6 +19,8 @@ function alb-gh-test-alb-nginx() (
   local image=$(docker images | grep theseedoaa/alb | head -1 | awk '{printf "%s:%s",$1,$2}')
   echo "test nginx $image"
   ./scripts/run-like-ci-nginx.sh $image
+  ls
+  cat ./luacov.summary
 )
 
 function alb-gh-build-alb() (

diff --git a/template/actions/alb-nginx.sh b/template/actions/alb-nginx.sh
@@ -68,10 +68,9 @@ function alb-test-all-in-ci-nginx() {
   echo "check" $end_check
   echo "test" $end_test
   pwd
-  tree
-  ls ./template/
   luacov-console $PWD/template/nginx/lua/
   luacov-console $PWD/template/nginx/lua/ -s
+  luacov-console $PWD/template/nginx/lua/ -s > ./luacov.summary
 }
 
 function test-nginx-local() {

diff --git a/template/t/AlaudaLib.pm b/template/t/AlaudaLib.pm
@@ -20,6 +20,8 @@ sub tgl_log(@msgs) {
    warn "[tgl_log]  @msgs\n";
 }
 
+tgl_log("lua cov $LUACOV");
+
 sub gen_lua_test($block) {
     my $lua_test_mode = "false";
     my $lua_test_full = '';