Changes pioarduino (#12)

Jason2866 · web-flow · commit 784ff0806fa1 · 2025-06-19T15:33:31.000+02:00
* add OEM ESP32-S0WD-OEM
* add release helpers
diff --git a/.github/workflows/build_esptool.yml b/.github/workflows/build_esptool.yml
@@ -1,6 +1,12 @@
 name: Build esptool
 
-on: [push, pull_request]
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - "v*.*.*"
+    paths-ignore:
+    - '.github/**' # Ignore changes towards the .github directory
 
 jobs:
   build-esptool-binaries-arm:
@@ -10,13 +16,13 @@ jobs:
       matrix:
         platform: [armv7, aarch64]
     env:
-      DISTPATH: esptool-linux-${{ matrix.platform }}
+      DISTPATH: esptool-${{ matrix.platform }}
       STUBS_DIR: ./esptool/targets/stub_flasher/
       EFUSE_DIR: ./espefuse/efuse_defs/
       PIP_EXTRA_INDEX_URL: "https://dl.espressif.com/pypi"
     steps:
       - name: Checkout repository
-        uses: actions/checkout@master
+        uses: actions/checkout@v4
       - uses: uraimo/run-on-arch-action@v2
         name: Build and test in ${{ matrix.platform }}
         with:
@@ -35,7 +41,7 @@ jobs:
             add-apt-repository -y ppa:deadsnakes/ppa
             apt-get update -y
             apt-get install --ignore-missing -y python3.11 python3.11-dev python3-pip pkg-config openssl libffi-dev libssl-dev cargo rustc
-            python3.11 -m pip install --upgrade pip setuptools wheel
+            python3.11 -m pip install --upgrade pip setuptools==74.1.3 wheel
           run: |
             python3.11 -m pip install --upgrade cffi
             adduser --disabled-password --gecos "" builder
@@ -58,11 +64,8 @@ jobs:
             ./${{ env.DISTPATH }}/espsecure -h || exit 1
             ./${{ env.DISTPATH }}/esp_rfc2217_server -h || exit 1
 
-            # Add license and readme
-            mv LICENSE README.md ./${{ env.DISTPATH }}
-
       - name: Archive artifact
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.DISTPATH }}
           path: ${{ env.DISTPATH }}
@@ -83,7 +86,7 @@ jobs:
           SEPARATOR: ':'
           RUN_ON: macos-latest # Versions 14 and higher are ARM-based.
         - platform: windows
-          TARGET: windows-amd64
+          TARGET: win64
           EXTEN: .exe
           SEPARATOR: ';'
           RUN_ON: windows-latest
@@ -98,11 +101,16 @@ jobs:
       PIP_EXTRA_INDEX_URL: "https://dl.espressif.com/pypi"
     steps:
       - name: Checkout repository
-        uses: actions/checkout@master
+        uses: actions/checkout@v4
       - name: Set up Python 3.11
-        uses: actions/setup-python@master
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: 3.11
+      - name: Update esptool version when releasing
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          python ci/patch_release.py --version ${{ github.ref_name }} esptool/__init__.py
+          #git diff
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -132,63 +140,74 @@ jobs:
           ./${{ env.DISTPATH }}/espefuse${{ matrix.EXTEN }} -h
           ./${{ env.DISTPATH }}/espsecure${{ matrix.EXTEN }} -h
           ./${{ env.DISTPATH }}/esp_rfc2217_server${{ matrix.EXTEN }} -h
-      - name: Add license and readme
-        shell: bash
-        run: mv LICENSE README.md ./${{ env.DISTPATH }}
       - name: Archive artifact
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.DISTPATH }}
           path: ${{ env.DISTPATH }}
+      - name: Update package.json when a release tag is set
+        if: startsWith(github.ref, 'refs/tags/') && matrix.platform == 'linux-amd64'
+        run: |
+          rm -f package.json
+          python ci/gen_pio_manifest.py -o "./" -s ${{ github.ref_name }}
+      - name: Upload package.json artifact
+        if: startsWith(github.ref, 'refs/tags/') && matrix.platform == 'linux-amd64'
+        uses: actions/upload-artifact@v4
+        with:
+          name: manifest
+          path: /home/runner/work/esptool/esptool/package.json
 
-  create_release:
-    name: Create GitHub release
-    if: startsWith(github.ref, 'refs/tags/') && !(contains(github.ref_name, 'dev'))
-    needs: [build-esptool-binaries, build-esptool-binaries-arm]
+  push_stubs:
+    name: Commit changed package.json
+    needs: build-esptool-binaries
     runs-on: ubuntu-latest
-    env:
-      PIP_EXTRA_INDEX_URL: "https://dl.espressif.com/pypi"
-    permissions:
-      contents: write
     steps:
-      - name: Get version
-        id: get_version
-        run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
-        shell: bash
-      - name: Checkout
-        uses: actions/checkout@master
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        if: startsWith(github.ref, 'refs/tags/')
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        if: startsWith(github.ref, 'refs/tags/')
         with:
-          fetch-depth: 0
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install --user -e ".[dev]"
-      - name: Generate changelog
-        run: |
-          cz changelog ${{ steps.get_version.outputs.VERSION }} --template ci/gh_changelog_template.md.j2 --file-name changelog_body.md
-          cat changelog_body.md
-      - name: Download built binaries
-        uses: actions/download-artifact@master
-      - name: Compress and rename binaries
-        run: |
-          for dir in esptool-*; do
-            if [[ "$dir" == esptool-win* ]]; then
-              zip -r "esptool-v${{ steps.get_version.outputs.VERSION }}-${dir#esptool-}.zip" "$dir"
-            else
-              chmod -R u=rwx,g=rx,o=rx "$dir"
-              tar -cvzf "esptool-v${{ steps.get_version.outputs.VERSION }}-${dir#esptool-}.tar.gz" "$dir"
-            fi
-          done
-      - name: Create release
-        id: create_release
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          name: |
+            manifest
+          path: |
+           ./
+      - uses: stefanzweifel/git-auto-commit-action@v5
+        if: startsWith(github.ref, 'refs/tags/')
         with:
-          body_path: changelog_body.md
-          name: Version ${{ steps.get_version.outputs.VERSION }}
-          draft: true
-          prerelease: false
-          files: |
-            esptool-v${{ steps.get_version.outputs.VERSION }}-*.zip
-            esptool-v${{ steps.get_version.outputs.VERSION }}-*.tar.gz
+          commit_message: update manifest
+
+  release:
+      name: Upload release binaries
+      needs: [build-esptool-binaries, build-esptool-binaries-arm, push_stubs]
+      if: startsWith(github.ref, 'refs/tags/')
+      runs-on: ubuntu-latest
+      steps:
+        - name: Checkout repository
+          uses: actions/checkout@v4
+        - name: Zip esptool.py
+          run: |
+            echo "Packaging new esptool release: ${{ github.ref_name }}"
+            python ci/patch_release.py --version ${{ github.ref_name }} esptool/__init__.py
+            rm package.json
+            python ci/gen_pio_manifest.py -o "./" -s ${{ github.ref_name }}
+            python ci/pack_python.py
+        - name: Download built binaries
+          uses: actions/download-artifact@v4
+        - name: Rename and package binaries
+          run: |
+            zip -r esptool-armv7.zip ./esptool-armv7
+            zip -r esptool-aarch64.zip ./esptool-aarch64
+            zip -r esptool-macos-arm64.zip ./esptool-macos-arm64
+            zip -r esptool-macos-amd64.zip ./esptool-macos-amd64
+            zip -r esptool-linux-amd64.zip ./esptool-linux-amd64
+            zip -r esptool-win64.zip ./esptool-win64
+        - name: Release
+          uses: jason2866/action-gh-release@v1.3
+          with:
+            prerelease: false
+            files: |
+              *.zip
+          env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/ci/gen_pio_manifest.py b/ci/gen_pio_manifest.py
@@ -0,0 +1,83 @@
+# ruff: noqa
+import argparse
+import json
+import os
+import re
+import sys
+import datetime
+
+MANIFEST_DATA = {
+    "name": "tool-esptoolpy",
+    "description": "A serial utility to communicate & flash code to Espressif chips",
+    "keywords": ["tools", "uploader", "tasmota", "espressif", "esp8266", "esp32"],
+    "license": "GPL-2.0-or-later",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/tasmota/esptool",
+    },
+}
+
+
+def convert_version(version_string):
+    """A helper function that converts a custom version string
+    to a suitable SemVer alternative. For example:
+    'release/v5.1' becomes '5.1.0',
+    'v7.7.7' becomes '7.7.7'
+    """
+
+    regex_pattern = (
+        r"v(?P<MAJOR>0|[1-9]\d*)\.(?P<MINOR>0|[1-9]\d*)\.*(?P<PATCH>0|[1-9]\d*)*"
+    )
+    match = re.search(regex_pattern, version_string)
+    if not match:
+        sys.stderr.write(
+            f"No regex match found for '{regex_pattern}' in '{version_string}'\n"
+        )
+        return ""
+
+    major, minor, patch = match.groups()
+    if not patch:
+        patch = "0"
+
+    return ".".join((major, minor, patch))
+
+
+def main(dst_dir, version_string):
+
+    converted_version = convert_version(version_string)
+    if not converted_version:
+        sys.stderr.write(f"Failed to convert version '{version_string}'\n")
+        return -1
+
+    manifest_file_path = os.path.join(dst_dir, "package.json")
+    build_date = datetime.date.today()
+    with open(manifest_file_path, "w", encoding="utf8") as fp:
+        MANIFEST_DATA["version"] = f"{converted_version}"
+        MANIFEST_DATA["date"] = f"{build_date}"
+        json.dump(MANIFEST_DATA, fp, indent=2)
+
+    print(
+        f"Generated '{manifest_file_path}' with '{converted_version}' version"
+    )
+    return 0
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "-o",
+        "--dst-dir",
+        dest="dst_dir",
+        required=True,
+        help="Destination where the 'package.json' will be located",
+    )
+    parser.add_argument(
+        "-s",
+        "--version-string",
+        dest="version_string",
+        required=True,
+        help="Version string in format v*.*.*",
+    )
+    args = parser.parse_args()
+
+    sys.exit(main(args.dst_dir, args.version_string))
diff --git a/ci/pack_python.py b/ci/pack_python.py
@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+# ruff: noqa
+
+import shutil
+import subprocess
+
+
+def main():
+
+    # remove not needed for plain python use
+    shutil.rmtree("ci", ignore_errors=True)
+    shutil.rmtree("docs", ignore_errors=True)
+    shutil.rmtree("flasher_stub", ignore_errors=True)
+    shutil.rmtree("test", ignore_errors=True)
+
+    zipfile = "esptool.zip"
+
+    print("Zip needed files into {}...".format(zipfile))
+    subprocess.run(["/usr/bin/7z", "a", "-mx=9", "-tzip", "-xr!.*", zipfile, "./"], check=True) # noqa: E501
+
+
+if __name__ == "__main__":
+    main()
diff --git a/ci/patch_release.py b/ci/patch_release.py
@@ -0,0 +1,40 @@
+# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# ruff: noqa
+import argparse
+import re
+
+LINE_RE = re.compile(r"^__version__ = ['\"]([^'\"]*)['\"]")
+NEW_LINE = '__version__ = "{}"\n'
+
+
+def patch_file(path, new_version):
+    new_version = new_version.lstrip("v")
+
+    with open(path, "r") as fin:
+        lines = fin.readlines()
+
+    for i, line in enumerate(lines, start=0):
+        m = LINE_RE.search(line)
+        if m:
+            lines[i] = NEW_LINE.format(new_version)
+            break
+
+    with open(path, "w") as fout:
+        fout.writelines(lines)
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("file", help="Path to script with __version__")
+    parser.add_argument(
+        "--version", help="Version specifier to patch the version to"
+    )
+    args = parser.parse_args()
+    patch_file(args.file, args.version)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/esptool/__init__.py b/esptool/__init__.py
@@ -31,7 +31,7 @@
     "write_mem",
 ]
 
-__version__ = "4.8.1"
+__version__ = "5.0.0-dev"
 
 import os
 import shlex
diff --git a/esptool/targets/esp32.py b/esptool/targets/esp32.py
@@ -227,6 +227,7 @@ def get_chip_description(self):
             0: "ESP32-S0WDQ6" if sc else "ESP32-D0WDQ6-V3" if rev3 else "ESP32-D0WDQ6",
             1: "ESP32-S0WD" if sc else "ESP32-D0WD-V3" if rev3 else "ESP32-D0WD",
             2: "ESP32-D2WD",
+            3: "ESP32-S0WD-OEM" if sc else "ESP32-D0WD-OEM",
             4: "ESP32-U4WDH",
             5: "ESP32-PICO-V3" if rev3 else "ESP32-PICO-D4",
             6: "ESP32-PICO-V3-02",
diff --git a/package.json b/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "tool-esptoolpy",
+  "description": "A serial utility to communicate & flash code to Espressif chips",
+  "keywords": [
+    "tools",
+    "uploader",
+    "tasmota",
+    "espressif",
+    "esp8266",
+    "esp32"
+  ],
+  "license": "GPL-2.0-or-later",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/tasmota/esptool"
+  },
+  "version": "5.0.0-dev",
+  "date": "2025-06-19"
+}
diff --git a/pyproject.toml b/pyproject.toml

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`"write_mem",`
`32`	`32`	`]`
`33`	`33`
`34`		`-__version__ = "4.8.1"`
	`34`	`+__version__ = "5.0.0-dev"`
`35`	`35`
`36`	`36`	`import os`
`37`	`37`	`import shlex`