Merge remote-tracking branch 'root/master' into pr-powermon

This commit is contained in:
Kevin Hester
2024-06-26 13:33:34 -07:00
2 changed files with 27 additions and 27 deletions

View File

@@ -41,7 +41,7 @@ jobs:
- name: Get version
id: get_version
run: >-
poetry version
poetry version --short | sed 's/^/::set-output name=version::/'
- name: Create GitHub release
uses: actions/create-release@v1
@@ -152,31 +152,31 @@ jobs:
asset_name: readme.txt
asset_content_type: text/plain
build-and-publish-windows:
runs-on: windows-latest
needs: release_create
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ needs.release_create.outputs.new_sha }}
# build-and-publish-windows:
# runs-on: windows-latest
# needs: release_create
# steps:
# - name: Checkout
# uses: actions/checkout@v4
# with:
# ref: ${{ needs.release_create.outputs.new_sha }}
- name: Set up Python 3.9
uses: actions/setup-python@v5
with:
python-version: "3.9"
# - name: Set up Python 3.9
# uses: actions/setup-python@v5
# with:
# python-version: "3.9"
- name: Build
run: |
pip install poetry
bin/build-bin.sh
# - name: Build
# run: |
# pip install poetry
# bin/build-bin.sh
- name: Add windows to release
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.release_create.outputs.upload_url }}
asset_path: dist/meshtastic.exe
asset_name: meshtastic_windows
asset_content_type: application/zip
# - name: Add windows to release
# uses: actions/upload-release-asset@v1
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# with:
# upload_url: ${{ needs.release_create.outputs.upload_url }}
# asset_path: dist/meshtastic.exe
# asset_name: meshtastic_windows
# asset_content_type: application/zip

View File

@@ -1,6 +1,6 @@
[tool.poetry]
name = "meshtastic"
version = "2.3.11"
version = "2.3.12"
description = "Python API & client shell for talking to Meshtastic devices"
authors = ["Meshtastic Developers <contact@meshtastic.org>"]
license = "GPL-3.0-only"