From 3cd9fcef46739eb15b27793d8b033f2391dc876c Mon Sep 17 00:00:00 2001 From: Djuri Baars Date: Sat, 21 Sep 2024 18:51:41 +0200 Subject: [PATCH 1/9] Add more exotic versions to HW detection --- app/fw_updater.py | 11 ++++++++--- app/release_checker.py | 5 ++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/fw_updater.py b/app/fw_updater.py index e4e5d8e..8bd2206 100644 --- a/app/fw_updater.py +++ b/app/fw_updater.py @@ -70,9 +70,14 @@ class FwUpdater: def start_firmware_update(self, release_name, address, hw_rev): # self.SetStatusText(f"Starting firmware update") - model_name = "lolin_s3_mini_213epd" - if (hw_rev == "REV_B_EPD_2_13"): - model_name = "btclock_rev_b_213epd" + hw_rev_to_model = { + "REV_B_EPD_2_13": "btclock_rev_b_213epd", + "REV_V8_EPD_2_13": "btclock_v8_213epd", + "REV_A_EPD_2_9": "lolin_s3_mini_29epd" + } + + model_name = hw_rev_to_model.get(hw_rev, "lolin_s3_mini_213epd") + local_filename = f"{get_app_data_folder()}/{ release_name}_{model_name}_firmware.bin" diff --git a/app/release_checker.py b/app/release_checker.py index 15272dc..032a26c 100644 --- a/app/release_checker.py +++ b/app/release_checker.py @@ -60,7 +60,10 @@ class ReleaseChecker: self.release_name = release_name filenames_to_download = ["lolin_s3_mini_213epd_firmware.bin", - "btclock_rev_b_213epd_firmware.bin", "littlefs.bin"] + "lolin_s3_mini_29epd_firmware.bin", + "btclock_v8_213epd_firmware.bin", + "btclock_rev_b_213epd_firmware.bin", + "littlefs.bin"] asset_urls = [asset['browser_download_url'] for asset in latest_release['assets'] if asset['name'] in filenames_to_download] From 7dfed6af6c012589c4d79ae9db697ca2f095e339 Mon Sep 17 00:00:00 2001 From: Djuri Baars Date: Sun, 17 Nov 2024 21:27:50 -0600 Subject: [PATCH 2/9] Change API to rof.tools mirrors --- app/release_checker.py | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/app/release_checker.py b/app/release_checker.py index 032a26c..d5c897f 100644 --- a/app/release_checker.py +++ b/app/release_checker.py @@ -11,6 +11,7 @@ from app.utils import get_app_data_folder, keep_latest_versions CACHE_FILE = get_app_data_folder() + '/cache.json' CACHE_DURATION = timedelta(minutes=30) +LATEST_RELEASE_ENDPOINT = "https://git.rof.tools/api/v1/repos/mirrors/btclock_v3/tags" class ReleaseChecker: '''Release Checker for firmware updates''' @@ -34,7 +35,7 @@ class ReleaseChecker: def fetch_latest_release(self): '''Fetch latest firmware release from GitHub''' - repo = "btclock/btclock_v3" + repo = "mirrors/btclock_v3" cache = self.load_cache() now = datetime.now() @@ -42,7 +43,8 @@ class ReleaseChecker: if 'latest_release' in cache and (now - datetime.fromisoformat(cache['latest_release']['timestamp'])) < CACHE_DURATION: latest_release = cache['latest_release']['data'] else: - url = f"https://api.github.com/repos/{repo}/releases/latest" +# url = f"https://api.github.com/repos/{repo}/releases/latest" + url = f"https://git.rof.tools/api/v1/repos/{repo}/releases/latest" try: response = requests.get(url) response.raise_for_status() @@ -72,8 +74,9 @@ class ReleaseChecker: for asset_url in asset_urls: self.download_file(asset_url, release_name) - ref_url = f"https://api.github.com/repos/{ - repo}/git/ref/tags/{release_name}" + ref_url = f"https://git.rof.tools/api/v1/repos/{repo}/tags/{release_name}" + #ref_url = f"https://api.github.com/repos/{ +# repo}/git/ref/tags/{release_name}" if ref_url in cache and (now - datetime.fromisoformat(cache[ref_url]['timestamp'])) < CACHE_DURATION: commit_hash = cache[ref_url]['data'] @@ -81,15 +84,8 @@ class ReleaseChecker: response = requests.get(ref_url) response.raise_for_status() ref_info = response.json() - if ref_info["object"]["type"] == "commit": - commit_hash = ref_info["object"]["sha"] - else: - tag_url = f"https://api.github.com/repos/{ - repo}/git/tags/{ref_info['object']['sha']}" - response = requests.get(tag_url) - response.raise_for_status() - tag_info = response.json() - commit_hash = tag_info["object"]["sha"] + commit_hash = ref_info["commit"]["sha"] + cache[ref_url] = { 'data': commit_hash, 'timestamp': now.isoformat() From c820fb942117ac9c71c50dcd31d3c308579aeabd Mon Sep 17 00:00:00 2001 From: Djuri Baars Date: Tue, 26 Nov 2024 01:06:00 +0100 Subject: [PATCH 3/9] Change endpoint to btclock git --- app/release_checker.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/release_checker.py b/app/release_checker.py index d5c897f..f811c94 100644 --- a/app/release_checker.py +++ b/app/release_checker.py @@ -11,7 +11,7 @@ from app.utils import get_app_data_folder, keep_latest_versions CACHE_FILE = get_app_data_folder() + '/cache.json' CACHE_DURATION = timedelta(minutes=30) -LATEST_RELEASE_ENDPOINT = "https://git.rof.tools/api/v1/repos/mirrors/btclock_v3/tags" +LATEST_RELEASE_ENDPOINT = "https://git.btclock.dev/api/v1/repos/btclock/btclock_v3/tags" class ReleaseChecker: '''Release Checker for firmware updates''' @@ -35,7 +35,7 @@ class ReleaseChecker: def fetch_latest_release(self): '''Fetch latest firmware release from GitHub''' - repo = "mirrors/btclock_v3" + repo = "btclock/btclock_v3" cache = self.load_cache() now = datetime.now() @@ -44,7 +44,7 @@ class ReleaseChecker: latest_release = cache['latest_release']['data'] else: # url = f"https://api.github.com/repos/{repo}/releases/latest" - url = f"https://git.rof.tools/api/v1/repos/{repo}/releases/latest" + url = f"https://git.btclock.dev/api/v1/repos/{repo}/releases/latest" try: response = requests.get(url) response.raise_for_status() @@ -74,7 +74,7 @@ class ReleaseChecker: for asset_url in asset_urls: self.download_file(asset_url, release_name) - ref_url = f"https://git.rof.tools/api/v1/repos/{repo}/tags/{release_name}" + ref_url = f"https://git.btclock.dev/api/v1/repos/{repo}/tags/{release_name}" #ref_url = f"https://api.github.com/repos/{ # repo}/git/ref/tags/{release_name}" if ref_url in cache and (now - datetime.fromisoformat(cache[ref_url]['timestamp'])) < CACHE_DURATION: From 46da0c049be779d6eb98b639422d68aaa8bb1893 Mon Sep 17 00:00:00 2001 From: Djuri Baars Date: Tue, 31 Dec 2024 11:52:58 +0100 Subject: [PATCH 4/9] Update for new filenames --- app/fw_updater.py | 16 ++++++++++++---- app/gui/action_button_panel.py | 3 ++- app/release_checker.py | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/fw_updater.py b/app/fw_updater.py index 8bd2206..6ac6b97 100644 --- a/app/fw_updater.py +++ b/app/fw_updater.py @@ -93,18 +93,26 @@ class FwUpdater: address, os.path.abspath(local_filename), FLASH)) thread.start() - def start_fs_update(self, release_name, address): + def start_fs_update(self, release_name, address, hw_rev): + hw_rev_to_model = { + "REV_B_EPD_2_13": "littlefs_8MB", + "REV_V8_EPD_2_13": "littlefs_16MB", + "REV_A_EPD_2_9": "littlefs_4MB" + } + # Path to the firmware file - local_filename = f"{get_app_data_folder()}/{release_name}_littlefs.bin" + local_filename = f"{get_app_data_folder()}/{release_name}_{hw_rev_to_model.get(hw_rev, "littlefs_4MB")}.bin" self.updatingName = address self.currentlyUpdating = True if self.event_cb is not None: - self.event_cb("Starting WebUI update") + self.event_cb(f"Starting WebUI update {local_filename}") if os.path.exists(os.path.abspath(local_filename)): thread = Thread(target=self.run_fs_update, args=( address, os.path.abspath(local_filename), SPIFFS)) thread.start() - + else: + if self.event_cb is not None: + self.event_cb(f"Firmware file not found: {local_filename}") diff --git a/app/gui/action_button_panel.py b/app/gui/action_button_panel.py index bfbf3a2..34e66e2 100644 --- a/app/gui/action_button_panel.py +++ b/app/gui/action_button_panel.py @@ -80,6 +80,7 @@ class ActionButtonPanel(wx.Panel): selected_index = self.device_list.GetFirstSelected() if selected_index != -1: service_name = self.device_list.GetItemText(selected_index, 0) + hw_rev = self.device_list.GetItemText(selected_index, 3) info = self.listener.services.get(service_name) if self.currentlyUpdating: wx.MessageBox("Please wait, already updating", @@ -89,7 +90,7 @@ class ActionButtonPanel(wx.Panel): if info: address = info.parsed_addresses( )[0] if info.parsed_addresses() else "N/A" - self.parent_frame.fw_updater.start_fs_update(self.parent_frame.releaseChecker.release_name, address) + self.parent_frame.fw_updater.start_fs_update(self.parent_frame.releaseChecker.release_name, address, hw_rev) else: wx.MessageBox( "No service information available for selected device", "Error", wx.ICON_ERROR) diff --git a/app/release_checker.py b/app/release_checker.py index f811c94..64b0f79 100644 --- a/app/release_checker.py +++ b/app/release_checker.py @@ -65,7 +65,7 @@ class ReleaseChecker: "lolin_s3_mini_29epd_firmware.bin", "btclock_v8_213epd_firmware.bin", "btclock_rev_b_213epd_firmware.bin", - "littlefs.bin"] + "littlefs_4MB.bin", "littlefs_8MB.bin", "littlefs_16MB.bin"] asset_urls = [asset['browser_download_url'] for asset in latest_release['assets'] if asset['name'] in filenames_to_download] From 86b4b50b9908a681cc5578d02b411eadd86f4594 Mon Sep 17 00:00:00 2001 From: Djuri Baars Date: Tue, 31 Dec 2024 12:01:50 +0100 Subject: [PATCH 5/9] add forgejo workflow --- .forgejo/workflows/build_all.yaml | 170 ++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+) create mode 100644 .forgejo/workflows/build_all.yaml diff --git a/.forgejo/workflows/build_all.yaml b/.forgejo/workflows/build_all.yaml new file mode 100644 index 0000000..3e8698d --- /dev/null +++ b/.forgejo/workflows/build_all.yaml @@ -0,0 +1,170 @@ +name: Build all artifacts and make release + +on: + workflow_dispatch: + inputs: + build: + description: 'Select build type' + required: true + default: 'all' + options: + - all + - mac + - windows + - linux + +jobs: + build-macos: + if: ${{ github.event.inputs.build == 'all' || github.event.inputs.build == 'mac' }} + runs-on: macos-latest + permissions: + contents: write + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Download universal2 Python + run: | + curl -o python.pkg https://www.python.org/ftp/python/3.12.4/python-3.12.4-macos11.pkg + - name: Install Python + run: | + sudo installer -pkg python.pkg -target / + - name: Add Python to PATH + run: | + echo "/Library/Frameworks/Python.framework/Versions/3.12/bin" >> $GITHUB_PATH + - name: Verify Python installation + run: | + python3 --version + pip3 --version + - name: Install dependencies + run: | + pip3 install --upgrade pip + pip3 install pyinstaller + pip3 install --no-cache cffi --no-binary :all: + pip3 install --no-cache charset_normalizer --no-binary :all: + pip3 install -U --pre -f https://wxpython.org/Phoenix/snapshot-builds/ wxPython + pip3 install -r requirements.txt + - name: Build with PyInstaller + run: | + pyinstaller BTClockOTA-universal.spec + - name: Zip the app bundle + run: | + cd dist + zip -r BTClockOTA-macos-universal2.zip BTClockOTA.app + - name: Create DMG + run: | + mkdir dmg_temp + cp -R dist/BTClockOTA.app dmg_temp/ + # Create the DMG file + hdiutil create -volname "BTClockOTA" -srcfolder dmg_temp -ov -format UDZO "dist/BTClockOTA-universal.dmg" + - name: Archive artifacts + uses: actions/upload-artifact@v4 + with: + name: macos-artifacts + path: | + dist/* + !dist/BTClockOTA.app + build-windows: + if: ${{ github.event.inputs.build == 'all' || github.event.inputs.build == 'windows' }} + runs-on: docker + container: + image: ghcr.io/catthehacker/ubuntu:act-22.04 + permissions: + contents: write + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Cache Docker layers + uses: actions/cache@v4 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + - name: Run Docker Container + run: | + docker run --rm \ + --volume "${{ github.workspace }}:/src/" \ + --env SPECFILE=./BTClockOTA.spec \ + batonogov/pyinstaller-windows:latest + - name: Archive artifacts + uses: actions/upload-artifact@v4 + with: + name: windows-artifacts + path: dist/ + build-linux: + if: ${{ github.event.inputs.build == 'all' || github.event.inputs.build == 'linux' }} + runs-on: docker + container: + image: ghcr.io/catthehacker/ubuntu:act-22.04 + permissions: + contents: write + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Cache Docker layers + uses: actions/cache@v4 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + - name: Run Docker Container + run: | + docker run --rm \ + --volume "${{ github.workspace }}:/src/" \ + --env SPECFILE=./BTClockOTA.spec \ + ghcr.io/btclock/pyinstaller-wxpython-linux:latest && + mv dist/BTClockOTA dist/BTClockOTA-linux-amd64 + - name: Archive artifacts + uses: actions/upload-artifact@v4 + with: + name: linux-artifacts + path: dist/ + release: + needs: [build-macos, build-windows, build-linux] + runs-on: ubuntu-latest + permissions: + contents: write + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Get current block + id: getBlockHeight + run: echo "blockHeight=$(curl -s https://mempool.space/api/blocks/tip/height)" >> $GITHUB_OUTPUT + - name: Get Windows Artifacts + if: ${{ always() }} + uses: actions/download-artifact@v4 + with: + name: windows-artifacts + path: windows + - name: Get macOS Artifacts + if: ${{ always() }} + uses: actions/download-artifact@v4 + with: + name: macos-artifacts + path: macos + - name: Get Linux Artifacts + if: ${{ always() }} + uses: actions/download-artifact@v4 + with: + name: linux-artifacts + path: linux + - name: Create release + uses: ncipollo/release-action@v1 + with: + tag: ${{ steps.getBlockHeight.outputs.blockHeight }} + commit: main + name: release-${{ steps.getBlockHeight.outputs.blockHeight }} + artifacts: "macos/**/*.dmg,macos/**/*.zip,windows/**/*.exe,linux/*" + allowUpdates: true + makeLatest: true From 3452a924f964e53d429e48df25bd9443a0280ba4 Mon Sep 17 00:00:00 2001 From: Djuri Baars Date: Tue, 31 Dec 2024 12:02:53 +0100 Subject: [PATCH 6/9] Fix workflow --- .forgejo/workflows/build_all.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/build_all.yaml b/.forgejo/workflows/build_all.yaml index 3e8698d..3fda450 100644 --- a/.forgejo/workflows/build_all.yaml +++ b/.forgejo/workflows/build_all.yaml @@ -7,6 +7,7 @@ on: description: 'Select build type' required: true default: 'all' + type: choice options: - all - mac From cd5f999cdab718f10c74d6b8f70fb4edfb5a32d6 Mon Sep 17 00:00:00 2001 From: Djuri Baars Date: Tue, 31 Dec 2024 12:15:13 +0100 Subject: [PATCH 7/9] Use docker images directly instead of dind --- .forgejo/workflows/build_all.yaml | 42 +++++-------------------------- 1 file changed, 6 insertions(+), 36 deletions(-) diff --git a/.forgejo/workflows/build_all.yaml b/.forgejo/workflows/build_all.yaml index 3fda450..00d0fa2 100644 --- a/.forgejo/workflows/build_all.yaml +++ b/.forgejo/workflows/build_all.yaml @@ -68,27 +68,15 @@ jobs: if: ${{ github.event.inputs.build == 'all' || github.event.inputs.build == 'windows' }} runs-on: docker container: - image: ghcr.io/catthehacker/ubuntu:act-22.04 + image: batonogov/pyinstaller-windows:latest permissions: contents: write steps: - name: Checkout repository uses: actions/checkout@v4 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - name: Cache Docker layers - uses: actions/cache@v4 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-buildx- - - name: Run Docker Container + - name: Build with PyInstaller run: | - docker run --rm \ - --volume "${{ github.workspace }}:/src/" \ - --env SPECFILE=./BTClockOTA.spec \ - batonogov/pyinstaller-windows:latest + python -m PyInstaller $SPECFILE - name: Archive artifacts uses: actions/upload-artifact@v4 with: @@ -98,33 +86,15 @@ jobs: if: ${{ github.event.inputs.build == 'all' || github.event.inputs.build == 'linux' }} runs-on: docker container: - image: ghcr.io/catthehacker/ubuntu:act-22.04 + image: ghcr.io/btclock/pyinstaller-wxpython-linux:latest permissions: contents: write steps: - name: Checkout repository uses: actions/checkout@v4 - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - name: Cache Docker layers - uses: actions/cache@v4 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-buildx- - - name: Run Docker Container + - name: Build with PyInstaller run: | - docker run --rm \ - --volume "${{ github.workspace }}:/src/" \ - --env SPECFILE=./BTClockOTA.spec \ - ghcr.io/btclock/pyinstaller-wxpython-linux:latest && + python -m PyInstaller $SPECFILE && mv dist/BTClockOTA dist/BTClockOTA-linux-amd64 - name: Archive artifacts uses: actions/upload-artifact@v4 From 807d4d05851665860ce7c98e22576553a1b7b825 Mon Sep 17 00:00:00 2001 From: Djuri Baars Date: Tue, 31 Dec 2024 12:20:20 +0100 Subject: [PATCH 8/9] Add ghcr authentication --- .forgejo/workflows/build_all.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.forgejo/workflows/build_all.yaml b/.forgejo/workflows/build_all.yaml index 00d0fa2..677c8d1 100644 --- a/.forgejo/workflows/build_all.yaml +++ b/.forgejo/workflows/build_all.yaml @@ -87,6 +87,8 @@ jobs: runs-on: docker container: image: ghcr.io/btclock/pyinstaller-wxpython-linux:latest + username: dsbaars + password: ${{ secrets.GH_TOKEN }} permissions: contents: write steps: From c8c69a39b42972a6e57a7897a94879dadc242b07 Mon Sep 17 00:00:00 2001 From: Djuri Baars Date: Tue, 31 Dec 2024 12:41:11 +0100 Subject: [PATCH 9/9] More workflow fixes --- .forgejo/workflows/build_all.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/build_all.yaml b/.forgejo/workflows/build_all.yaml index 677c8d1..dfdf59e 100644 --- a/.forgejo/workflows/build_all.yaml +++ b/.forgejo/workflows/build_all.yaml @@ -66,7 +66,7 @@ jobs: !dist/BTClockOTA.app build-windows: if: ${{ github.event.inputs.build == 'all' || github.event.inputs.build == 'windows' }} - runs-on: docker + runs-on: docker-amd64 container: image: batonogov/pyinstaller-windows:latest permissions: @@ -84,11 +84,12 @@ jobs: path: dist/ build-linux: if: ${{ github.event.inputs.build == 'all' || github.event.inputs.build == 'linux' }} - runs-on: docker + runs-on: docker-amd64 container: image: ghcr.io/btclock/pyinstaller-wxpython-linux:latest - username: dsbaars - password: ${{ secrets.GH_TOKEN }} + credentials: + username: dsbaars + password: ${{ secrets.GH_TOKEN }} permissions: contents: write steps: