chore: Simplify release workflow

* Use softprops/action-gh-release for GH releases
* Simplify S3 uploads
* Use generic version for blackbox-tests
* Remove makever.sh
* Fix missing VERSION for blackbox tests
* Revert system LED bogus change

Author: ccrisan

.github/workflows/main.yml

@@ -43,12 +43,11 @@ jobs:
           fetch-depth: 0
       - name: Build
         run: |
-          export VERSION="$(/opt/makever.sh)"
           make clean
           make -j4
       - name: TestMyESP helper
         run: |
-          export VERSION="$(/opt/makever.sh)"
+          export VERSION=0.0.0-unknown.0
           extra_opts=""
           if [[ "${{ github.event.inputs.verbose }}" == "yes" ]]; then
               extra_opts+="--verbose"
@@ -92,42 +91,36 @@ jobs:
         uses: actions/checkout@master
       - name: Extract version from tag
         id: tagName
-        uses: little-core-labs/get-git-tag@v3.0.2
+        uses: olegtarasov/get-tag@v2.1
         with:
-          tagRegex: "version-(.*)"
+          tagRegex: "version-(?<version>.*)"
       - name: Build
         run: |
           export DEBUG=false
-          export VERSION="$(/opt/makever.sh)"
+          export VERSION="${{ steps.tagName.outputs.version }}"
           make clean
           make -j4
-          for flash_freq in 20 26 40 80; do
-              for flash_mode in qio qout dio dout; do
-                  rm -f build/firmware.bin
-                  make FLASH_MODE=${flash_mode} FLASH_FREQ=${flash_freq}
-                  mv build/firmware.bin build/firmware-${flash_mode}-${flash_freq}.bin
-              done
-          done
       - name: Setup s3cmd
         run: |
           echo "[default]" > ~/.s3cfg
           echo "access_key = ${{ secrets.AWS_ACCESS_KEY }}" >> ~/.s3cfg
           echo "secret_key = ${{ secrets.AWS_SECRET_KEY }}" >> ~/.s3cfg
       - name: Upload to S3
         run: |
-          if [[ "${GIT_TAG_NAME}" =~ beta.[0-9]+$ ]]; then  # beta version
+          VERSION="${{ steps.tagName.outputs.version }}"
+          if [[ "${VERSION}" =~ beta.[0-9]+$ ]]; then  # beta version
               latest_file="latest_beta"
-          elif [[ "${GIT_TAG_NAME}" =~ alpha.[0-9]+$ ]]; then  # alpha version
+          elif [[ "${VERSION}" =~ alpha.[0-9]+$ ]]; then  # alpha version
               latest_file="latest_alpha"
           else  # stable version
               latest_file="latest_stable"
           fi
-          echo "Version: ${GIT_TAG_NAME}" > build/${latest_file}
+          echo "Version: ${VERSION}" > build/${latest_file}
           echo -n "Date: " >> build/${latest_file}
           date "+%Y-%m-%d" >> build/${latest_file}
 
-          s3cmd put -P --guess-mime-type build/user*.bin  s3://${S3_BUCKET}/${S3_FOLDER}/${GIT_TAG_NAME}/
-          s3cmd put -P --guess-mime-type build/firmware-*.bin s3://${S3_BUCKET}/${S3_FOLDER}/${GIT_TAG_NAME}/
+          s3cmd put -P --guess-mime-type build/user*.bin  s3://${S3_BUCKET}/${S3_FOLDER}/${VERSION}/
+          s3cmd put -P --guess-mime-type build/firmware.bin s3://${S3_BUCKET}/${S3_FOLDER}/${VERSION}/
           s3cmd put -P --guess-mime-type build/${latest_file} s3://${S3_BUCKET}/${S3_FOLDER}/${latest_file}
           s3cmd put -P --guess-mime-type build/${latest_file} s3://${S3_BUCKET}/${S3_FOLDER}/latest
 
@@ -142,20 +135,15 @@ jobs:
         id: tagName
         uses: olegtarasov/get-tag@v2.1
         with:
-          tagRegex: "version-(.*)"
+          tagRegex: "version-(?<version>.*)"
       - name: Create Github release
-        run: |
-          url="https://api.github.com/repos/qtoggle/espqtoggle/releases?access_token=${{ secrets.GITHUB_TOKEN }}"
-          prerelease=$(if echo "${GIT_TAG_NAME}" | grep -E "alpha|beta" &>/dev/null; then echo true; else echo false; fi)
-          markdown="|  | QIO | QOUT | DIO | DOUT |\n"
-          markdown+="|:-:|:-:|:-:|:-:|:-:|\n"
-          for flash_freq in 20 26 40 80; do
-              markdown+="| ${flash_freq}MHz | "
-              for flash_mode in qio qout dio dout; do
-                  firmware_url="https://provisioning.qtoggle.io/firmware/espqtoggle/${GIT_TAG_NAME}/firmware-${flash_mode}-${flash_freq}.bin"
-                  markdown+=" [firmware.bin](${firmware_url}) |"
-              done
-              markdown+="\n"
-          done
-          body="{\"tag_name\": \"version-${GIT_TAG_NAME}\", \"name\": \"${GIT_TAG_NAME}\", \"body\": \"${markdown}\", \"prerelease\": ${prerelease}, \"draft\": true}"
-          curl -Ss "${url}" -X POST -d "${body}" > /dev/null
+        uses: softprops/action-gh-release@v1
+        with:
+          name: ${{ steps.tagName.outputs.version }}
+          draft: true
+          prerelease: contains(github.ref, 'alpha') || contains(github.ref, 'beta')
+          body: |
+            What's new (since ...):
+             - ...
+
+            Download [firmware.bin](https://provisioning.qtoggle.io/firmware/espqtoggle/${{ steps.tagName.outputs.version }}/firmware.bin).

builder/Dockerfile

@@ -32,7 +32,7 @@ ADD https://qtoggle.s3.amazonaws.com/various/xtensa-lx106-elf.tar.xz /opt
 RUN cd /opt && tar xvf xtensa-lx106-elf.tar.xz && rm xtensa-lx106-elf.tar.xz
 
 # esp8266 sdk
-ADD fix-sdk.sh makever.sh /opt/
+ADD fix-sdk.sh /opt/
 RUN git clone https://github.com/espressif/ESP8266_NONOS_SDK.git /opt/esp-nonos-sdk && \
     cd /opt/esp-nonos-sdk && \
     git checkout a0b1311 && \

builder/makever.sh

@@ -501,11 +501,8 @@ void update(void) {
             if (!wifi_station_is_connected()) {
                 new_led_value = (now_us * 2 / 1000000) % 2;
             }
-            else if (setup_mode_state == SETUP_MODE_TRIGGERED) {
-                new_led_value = !status_led_level;
-            }
             else {
-                return;
+                new_led_value = !status_led_level;
             }
         }