From e4a4956c19a93c8052b925eefd96551085b5a7a9 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Fri, 18 Nov 2022 19:27:09 +0100 Subject: [PATCH] ci: fix find-apps.sh default printout --- .github/workflows/codeball.yml | 17 ----------------- .github/workflows/run_test_cases.yaml | 9 ++++++--- scripts/find-apps.sh | 7 ++++--- 3 files changed, 10 insertions(+), 23 deletions(-) delete mode 100644 .github/workflows/codeball.yml diff --git a/.github/workflows/codeball.yml b/.github/workflows/codeball.yml deleted file mode 100644 index ed69d5c10..000000000 --- a/.github/workflows/codeball.yml +++ /dev/null @@ -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" diff --git a/.github/workflows/run_test_cases.yaml b/.github/workflows/run_test_cases.yaml index 9e2e12b9a..07ae00a50 100644 --- a/.github/workflows/run_test_cases.yaml +++ b/.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 diff --git a/scripts/find-apps.sh b/scripts/find-apps.sh index 65585f9fd..fefb73568 100755 --- a/scripts/find-apps.sh +++ b/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() {