From 41de679557b282e55e7ea671ab9a612b9412fa7b Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Thu, 22 Jun 2023 21:01:41 +0200 Subject: [PATCH] ci: run example config check in ci --- .github/workflows/run_test_cases.yaml | 24 +++++++++++++++++++ .../src/emqx_prometheus.app.src | 2 +- scripts/test/check-example-configs.sh | 3 +-- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run_test_cases.yaml b/.github/workflows/run_test_cases.yaml index a8f65b926..85b38627f 100644 --- a/.github/workflows/run_test_cases.yaml +++ b/.github/workflows/run_test_cases.yaml @@ -88,6 +88,30 @@ jobs: name: source-${{ matrix.profile }}-${{ matrix.otp }} path: source.zip + check_examples: + needs: + - build-matrix + - prepare + runs-on: ${{ needs.build-matrix.outputs.runs-on }} + strategy: + fail-fast: false + matrix: + include: ${{ fromJson(needs.build-matrix.outputs.prepare) }} + container: "ghcr.io/emqx/emqx-builder/${{ matrix.builder }}:${{ matrix.elixir }}-${{ matrix.otp }}-ubuntu22.04" + steps: + - uses: AutoModality/action-clean@v1 + - uses: actions/download-artifact@v3 + with: + name: source-${{ matrix.profile }}-${{ matrix.otp }} + path: . + - name: unzip source code + run: unzip -o -q source.zip + - name: check example config files + env: + PROFILE: ${{ matrix.profile }} + working-directory: source + run: ./scripts/test/check-example-configs.sh + static_checks: needs: - build-matrix diff --git a/apps/emqx_prometheus/src/emqx_prometheus.app.src b/apps/emqx_prometheus/src/emqx_prometheus.app.src index 147dcc28f..7252e4436 100644 --- a/apps/emqx_prometheus/src/emqx_prometheus.app.src +++ b/apps/emqx_prometheus/src/emqx_prometheus.app.src @@ -2,7 +2,7 @@ {application, emqx_prometheus, [ {description, "Prometheus for EMQX"}, % strict semver, bump manually! - {vsn, "5.0.12"}, + {vsn, "5.0.13"}, {modules, []}, {registered, [emqx_prometheus_sup]}, {applications, [kernel, stdlib, prometheus, emqx, emqx_management]}, diff --git a/scripts/test/check-example-configs.sh b/scripts/test/check-example-configs.sh index bbf00cf8d..f71fb15eb 100755 --- a/scripts/test/check-example-configs.sh +++ b/scripts/test/check-example-configs.sh @@ -9,7 +9,6 @@ SCHEMA_MOD='emqx_conf_schema' if [ "${PROFILE}" = 'emqx-enterprise' ]; then DIR_NAME='ee-examples' SCHEMA_MOD='emqx_enterprise_schema' - PA="" fi IFS=$'\n' read -r -d '' -a FILES < <(find "${PROJ_DIR}/rel/config/${DIR_NAME}" -name "*.example" 2>/dev/null | sort && printf '\0') @@ -49,6 +48,6 @@ check_file() { end." } -for file in ${FILES[@]}; do +for file in "${FILES[@]}"; do check_file "$file" done