diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 5b7a59d..0000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,77 +0,0 @@ -name: "Build" - -on: - push: - branches: - - main - pull_request: - types: [opened, synchronize, reopened, labeled] - -jobs: - build_wifi_remote: - name: Build WiFi Remote Test - strategy: - matrix: - idf_ver: ["latest", "release-v5.3"] - test: [ { app: smoke_test, path: "test/smoke_test" }] - runs-on: ubuntu-20.04 - container: espressif/idf:${{ matrix.idf_ver }} - steps: - - name: Checkout code - uses: actions/checkout@v3 - - name: Checkout protocols - uses: actions/checkout@v3 - with: - repository: espressif/esp-protocols - ref: wifi_remote-v0.4.0 - sparse-checkout: | - ci/build_apps.py - ci/ignore_build_warnings.txt - sparse-checkout-cone-mode: false - path: protocols - - name: ccache - uses: hendrikmuhs/ccache-action@v1.2 - with: - key: ${{ matrix.idf_ver }} - - name: Build ${{ matrix.test.app }} with IDF-${{ matrix.idf_ver }} - shell: bash - run: | - . ${IDF_PATH}/export.sh - pip install idf-component-manager idf-build-apps --upgrade - python ./components/esp_wifi_remote/scripts/generate_slave_configs.py ./components/esp_wifi_remote/${{matrix.test.path}} - echo python $GITHUB_WORKSPACE/protocols/ci/build_apps.py ./components/esp_wifi_remote/${{matrix.test.path}} -vv --preserve-all - - build_wifi_remote_example: - name: Build WiFi Remote Example - strategy: - matrix: - idf_ver: ["latest"] - example: [ { app: host, path: "examples/mqtt" }, { app: slave, path: "examples/server" }] - include: - - idf_ver: "latest" - example: { app: slave, path: "examples/server" } - warning: "Warning: The smallest app partition is nearly full" - - runs-on: ubuntu-20.04 - container: espressif/idf:${{ matrix.idf_ver }} - steps: - - name: Checkout code - uses: actions/checkout@v3 - - name: Checkout protocols - uses: actions/checkout@v3 - with: - repository: espressif/esp-protocols - ref: wifi_remote-v0.4.0 - sparse-checkout: | - ci/build_apps.py - ci/ignore_build_warnings.txt - sparse-checkout-cone-mode: false - path: protocols - - name: Build ${{ matrix.example.app }} with IDF-${{ matrix.idf_ver }} - env: - EXPECTED_WARNING: ${{ matrix.warning }} - shell: bash - run: | - . ${IDF_PATH}/export.sh - pip install idf-component-manager idf-build-apps --upgrade - echo python $GITHUB_WORKSPACE/protocols/ci/build_apps.py ./components/esp_wifi_remote/${{matrix.example.path}} -vv --preserve-all diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 673d05a..3e49a54 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -2,7 +2,7 @@ name: Publish esp-wifi-remote on: workflow_run: - workflows: ["Build", "Compat checks"] + workflows: ["Compat checks"] branches: [main] types: - completed diff --git a/ci/detect_component_bump b/ci/detect_component_bump index cee363b..14a5246 100755 --- a/ci/detect_component_bump +++ b/ci/detect_component_bump @@ -2,6 +2,10 @@ set -e +git show -s +git show -s | grep '^Merge'; + + if ! git show -s | grep -q '^Merge'; then echo "Not a merge commit" exit 0;