From e5446e08bdae8b53a5be5d2593febda63e84f1c1 Mon Sep 17 00:00:00 2001 From: seeul8er <24637325+seeul8er@users.noreply.github.com> Date: Wed, 1 Jan 2025 19:00:07 +0100 Subject: [PATCH] Added action to build nightly release with artifact upload --- .../Dockerfile | 2 +- .../action.yml | 8 +--- .github/actions/esp-idf-with-node/Dockerfile | 3 -- .github/actions/esp-idf-with-node/action.yml | 22 ---------- .github/workflows/esp_idf.yml | 40 +++++-------------- 5 files changed, 13 insertions(+), 62 deletions(-) rename .github/actions/{esp-idf-5_2-with-node => esp-idf-5_3-with-node_nightly}/Dockerfile (84%) rename .github/actions/{esp-idf-5_2-with-node => esp-idf-5_3-with-node_nightly}/action.yml (67%) delete mode 100644 .github/actions/esp-idf-with-node/Dockerfile delete mode 100644 .github/actions/esp-idf-with-node/action.yml diff --git a/.github/actions/esp-idf-5_2-with-node/Dockerfile b/.github/actions/esp-idf-5_3-with-node_nightly/Dockerfile similarity index 84% rename from .github/actions/esp-idf-5_2-with-node/Dockerfile rename to .github/actions/esp-idf-5_3-with-node_nightly/Dockerfile index fba2d56..585a5a9 100644 --- a/.github/actions/esp-idf-5_2-with-node/Dockerfile +++ b/.github/actions/esp-idf-5_3-with-node_nightly/Dockerfile @@ -1,4 +1,4 @@ -FROM espressif/idf:release-v5.2 +FROM espressif/idf:release-v5.3 RUN apt update RUN apt-get install -y curl RUN curl -fsSL https://deb.nodesource.com/setup_18.x -o nodesource_setup.sh diff --git a/.github/actions/esp-idf-5_2-with-node/action.yml b/.github/actions/esp-idf-5_3-with-node_nightly/action.yml similarity index 67% rename from .github/actions/esp-idf-5_2-with-node/action.yml rename to .github/actions/esp-idf-5_3-with-node_nightly/action.yml index de6509a..06b723f 100644 --- a/.github/actions/esp-idf-5_2-with-node/action.yml +++ b/.github/actions/esp-idf-5_3-with-node_nightly/action.yml @@ -3,19 +3,13 @@ branding: color: red icon: wifi inputs: - target: - description: "ESP32 variant to build for" - default: "esp32" - required: false command: description: "Command to run inside the docker container (default: builds the project)" - default: "idf.py build" + default: "./create_release_zip.sh" required: false runs: using: 'docker' image: 'Dockerfile' - env: - IDF_TARGET: "${{inputs.target}}" args: - "/bin/bash" - "-c" diff --git a/.github/actions/esp-idf-with-node/Dockerfile b/.github/actions/esp-idf-with-node/Dockerfile deleted file mode 100644 index 1cdc06b..0000000 --- a/.github/actions/esp-idf-with-node/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM espressif/idf:release-v5.1 -RUN apt update -RUN apt -y install --no-install-recommends nodejs npm diff --git a/.github/actions/esp-idf-with-node/action.yml b/.github/actions/esp-idf-with-node/action.yml deleted file mode 100644 index de6509a..0000000 --- a/.github/actions/esp-idf-with-node/action.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: "Espressif IoT Development Framework (ESP-IDF), plus node.js and npm" -branding: - color: red - icon: wifi -inputs: - target: - description: "ESP32 variant to build for" - default: "esp32" - required: false - command: - description: "Command to run inside the docker container (default: builds the project)" - default: "idf.py build" - required: false -runs: - using: 'docker' - image: 'Dockerfile' - env: - IDF_TARGET: "${{inputs.target}}" - args: - - "/bin/bash" - - "-c" - - "${{inputs.command}}" diff --git a/.github/workflows/esp_idf.yml b/.github/workflows/esp_idf.yml index 92b103d..e882402 100644 --- a/.github/workflows/esp_idf.yml +++ b/.github/workflows/esp_idf.yml @@ -8,24 +8,7 @@ on: branches: [ master ] jobs: - build_esp32_v5_1: - runs-on: ubuntu-latest - strategy: - matrix: - target: ["esp32", "esp32s2", "esp32s3", "esp32c3"] - fail-fast: false - steps: - - name: Checkout repo - uses: actions/checkout@v4 - with: - ref: ${{ github.ref }} - submodules: 'recursive' - - name: ESP-IDF v5.1 build - uses: ./.github/actions/esp-idf-with-node - with: - target: "${{ matrix.target }}" - command: "idf.py set-target ${{matrix.target}} build" - build_esp32_v5_2: + build_idf_v5_3_generic: runs-on: ubuntu-latest strategy: matrix: @@ -37,25 +20,24 @@ jobs: with: ref: ${{ github.ref }} submodules: 'recursive' - - name: ESP-IDF v5.2 build - uses: ./.github/actions/esp-idf-5_2-with-node + - name: Generic ESP-IDF v5.3 target build + uses: ./.github/actions/esp-idf-5_3-with-node with: target: "${{ matrix.target }}" command: "idf.py set-target ${{matrix.target}} build" - build_esp32_v5_3: + build_idf_v5_3_nightly_release: runs-on: ubuntu-latest - strategy: - matrix: - target: ["esp32", "esp32s2", "esp32s3", "esp32c3", "esp32c6"] - fail-fast: false steps: - name: Checkout repo uses: actions/checkout@v4 with: ref: ${{ github.ref }} submodules: 'recursive' - - name: ESP-IDF v5.3 build - uses: ./.github/actions/esp-idf-5_3-with-node + - name: Release config build ESP-IDF v5.3 + uses: ./.github/actions/esp-idf-5_3-with-node_nightly with: - target: "${{ matrix.target }}" - command: "idf.py set-target ${{matrix.target}} build" + command: "bash ./create_release_zip.sh" + - uses: actions/upload-artifact@v4 + with: + name: DroneBridge_ESP32_nightly.zip + path: DroneBridge_ESP32_nightly.zip