Selaa lähdekoodia

ci: fix find-apps.sh default printout

Zaiming (Stone) Shi 3 vuotta sitten
vanhempi
commit
e4a4956c19
3 muutettua tiedostoa jossa 10 lisäystä ja 23 poistoa
  1. 0 17
      .github/workflows/codeball.yml
  2. 6 3
      .github/workflows/run_test_cases.yaml
  3. 4 3
      scripts/find-apps.sh

+ 0 - 17
.github/workflows/codeball.yml

@@ -1,17 +0,0 @@
-name: Codeball
-on: [pull_request]
-
-jobs:
-  codeball_job:
-    runs-on: ubuntu-latest
-    name: Codeball
-    steps:
-      # Run Codeball on all new Pull Requests 🚀
-      # For customizations and more documentation, see https://github.com/sturdy-dev/codeball-action
-      - name: Codeball
-        uses: sturdy-dev/codeball-action@v2
-        with:
-          approvePullRequests: "true"
-          labelPullRequestsWhenApproved: "true"
-          labelPullRequestsWhenReviewNeeded: "false"
-          failJobsWhenReviewNeeded: "false"

+ 6 - 3
.github/workflows/run_test_cases.yaml

@@ -39,7 +39,7 @@ jobs:
           working-directory: source
           env:
             PROFILE: emqx
-            DIAGNOSTIC: 1
+              #DIAGNOSTIC: 1
           run: |
             make ensure-rebar3
             # this will fetch all deps and compile
@@ -63,7 +63,7 @@ jobs:
           working-directory: source
           env:
             PROFILE: emqx-enterprise
-            DIAGNOSTIC: 1
+              #DIAGNOSTIC: 1
           run: |
             make ensure-rebar3
             # this will fetch all deps and compile
@@ -221,7 +221,7 @@ jobs:
       - uses: AutoModality/action-clean@v1
       - uses: actions/download-artifact@v3
         with:
-          name: source
+          name: source-emqx-enterprise
           path: .
       - name: unzip source code
         run: unzip -q source.zip
@@ -234,12 +234,15 @@ jobs:
 
       - name: make cover
         working-directory: source
+        env:
+          PROFILE: emqx-enterprise
         run: make cover
 
       - name: send to coveralls
         working-directory: source
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PROFILE: emqx-enterprise
         run: make coveralls
 
       - name: get coveralls logs

+ 4 - 3
scripts/find-apps.sh

@@ -11,7 +11,7 @@ help() {
     echo "--ci fast|docker: Print apps in json format for github ci mtrix"
 }
 
-CI='fast'
+CI='novalue'
 while [ "$#" -gt 0 ]; do
     case $1 in
         -h|--help)
@@ -45,7 +45,7 @@ CE="$(find_app 'apps')"
 EE="$(find_app 'lib-ee')"
 APPS_ALL="$(echo -e "${CE}\n${EE}")"
 
-if [ "$CI" = 'no' ]; then
+if [ "$CI" = 'novalue' ]; then
     echo "${APPS_ALL}"
     exit 0
 fi
@@ -77,7 +77,8 @@ dimensions() {
             exit 1
             ;;
     esac
-    echo -n "$app $profile" | jq -R -s -c 'split(" ")'
+    ## poor-man's json formatter
+    echo -n -e "[\"$app\", \"$profile\"]"
 }
 
 matrix() {