From 564345ec0871cc945f9802b72eb7c4443f5d2f83 Mon Sep 17 00:00:00 2001 From: Semyon Yakimov Date: Mon, 17 Jan 2022 19:51:12 +0300 Subject: [PATCH] Release v0.10.2 GH CI autorelease --- .github/workflows/asset.yml | 64 ------------------------------------- .github/workflows/build.yml | 60 ++++++++++++++++++++++++++++++++++ CHANGELOG.md | 16 ++++++++-- CHANGELOG.ru.md | 13 ++++++++ README.md | 1 + README.ru.md | 1 + SportiduinoPQ.py | 2 +- 7 files changed, 90 insertions(+), 67 deletions(-) delete mode 100644 .github/workflows/asset.yml create mode 100644 .github/workflows/build.yml create mode 100644 CHANGELOG.ru.md diff --git a/.github/workflows/asset.yml b/.github/workflows/asset.yml deleted file mode 100644 index f972890..0000000 --- a/.github/workflows/asset.yml +++ /dev/null @@ -1,64 +0,0 @@ -on: - push: - # Sequence of patterns matched against refs/tags - tags: - - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 - -name: Upload Release Asset - -jobs: - build: - name: Upload Release Asset - runs-on: windows-latest - strategy: - matrix: - architecture: [x86, x64] - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Set up Python - id: set_up_python - uses: actions/setup-python@v1 - with: - python-version: '3.8' - architecture: ${{ matrix.architecture }} - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install -r requirements.txt - - name: Generate binary exe file - run: | - pip install pyinstaller - pyinstaller --onefile --noconsole --add-data 'translation/*.qm;translation/' SportiduinoPQ.py - - name: Get the version - id: get_version - run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//} - shell: bash - - name: Upload artifacts - uses: actions/upload-artifact@v1 - with: - name: SportiduinoPQ-${{ steps.get_version.outputs.VERSION }}-win-${{ matrix.architecture }} - path: dist/SportiduinoPQ.exe - #- name: Create Release - # id: create_release - # uses: actions/create-release@v1 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # tag_name: ${{ github.ref }} - # release_name: Release ${{ github.ref }} - # draft: false - # prerelease: false - #- name: Upload Release Asset - # id: upload-release-asset - # uses: actions/upload-release-asset@v1 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - # asset_path: ./my-artifact.zip - # asset_name: my-artifact.zip - # asset_content_type: application/zip - - -# vim: ts=2 sw=2 et diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..c6862be --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,60 @@ +name: Build + +on: + push: + # Sequence of patterns matched against refs/tags + tags: + - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 + + +jobs: + build: + runs-on: windows-latest + strategy: + matrix: + architecture: [x86, x64] + name: Build on Windows ${{ matrix.architecture }} + steps: + - name: Checkout code + uses: actions/checkout@v2 + - name: Set up Python + id: set_up_python + uses: actions/setup-python@v1 + with: + python-version: '3.8' + architecture: ${{ matrix.architecture }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + - name: Generate binary exe file + run: | + pip install pyinstaller + pyinstaller --onefile --noconsole --add-data 'translation/*.qm;translation/' SportiduinoPQ.py + - name: Get the version + id: get_version + run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//} + shell: bash + - name: Rename artifacts + run: | + mv dist/SportiduinoPQ.exe dist/SportiduinoPQ-${{ steps.get_version.outputs.VERSION }}-win-${{ matrix.architecture }}.exe + - name: Upload artifacts + uses: actions/upload-artifact@v2 + with: + #name: SportiduinoPQ-${{ steps.get_version.outputs.VERSION }}-win-${{ matrix.architecture }} + path: dist/*.exe + - name: Generate Changelog + run: | + # Get text after ## ... from changelog.ru.md and changelog.en.md + sed -n "/^##.*${{ github.ref_name }}$/,/^##/{/^##/d ; p}" CHANGELOG.ru.md | sed -z "s/^\n*//g" - > ${{ github.workspace }}-CHANGELOG.txt + printf "\n---\n" >> ${{ github.workspace }}-CHANGELOG.txt + sed -n "/^##.*${{ github.ref_name }}$/,/^##/{/^##/d ; p}" CHANGELOG.md | sed -z "s/^\n*//g" - >> ${{ github.workspace }}-CHANGELOG.txt + - name: Release + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') + with: + body_path: ${{ github.workspace }}-CHANGELOG.txt + files: | + dist/*.exe + +# vim: ts=2 sw=2 et diff --git a/CHANGELOG.md b/CHANGELOG.md index 4678d2f..1e5da8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,21 @@ -## [0.10.0] - 2021-05-14 +## 2022-01-17 - v0.10.2 + +- QSpinBox for card number +- Don't apply datetime from the past +- Disable deprecated Fast punch config option + +[All changes](https://github.com/sportiduino/sportiduinopq/compare/v0.10.1...v0.10.2) + +## 2021-10-21 - v0.10.1 + +- Autobuild with Python 3.8 for Windows 7 + +## 2021-05-14 - v0.10.0 - Autosleep option for BS v3.9.0 - Reset secs to 0 for wakeup timestamp for Sleep Card - Lint (Flake8) fixes -## [0.9.0] - 2020-11-09 +## 2020-11-09 - v0.9.0 - Master station v1.8 support - Compatibility with MS v1.6 (only reading card) - Added auto card polling mode diff --git a/CHANGELOG.ru.md b/CHANGELOG.ru.md new file mode 100644 index 0000000..35e61ab --- /dev/null +++ b/CHANGELOG.ru.md @@ -0,0 +1,13 @@ +## 2022-01-17 - v0.10.2 + +- QSpinBox для номера чипа +- Не используются datetime из прошлого (чип сна) +- Выключена устаревшая опция "Быстрая отметка" в конфиге + +[Все изменения](https://github.com/sportiduino/sportiduinopq/compare/v0.10.1...v0.10.2) + +## 2021-10-21 - v0.10.1 + +- Автосборка с Python 3.8 для Windows 7 + + diff --git a/README.md b/README.md index 9e6af7b..904e8c6 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ and PyQt5 for working with [Sportiduino](https://github.com/sportiduino/sportidu - [Manual](https://github.com/sportiduino/sportiduino/blob/master/Doc/en/UserManual.md) - [Downloads](https://github.com/sportiduino/SportiduinoPQ/releases) +- [Changelog](CHANGELOG.md) ## Installation diff --git a/README.ru.md b/README.ru.md index c953a9f..d07c001 100644 --- a/README.ru.md +++ b/README.ru.md @@ -12,6 +12,7 @@ - [Руководство пользователя](https://github.com/sportiduino/sportiduino/blob/master/Doc/ru/UserManual.md) - [Скачать](https://github.com/sportiduino/SportiduinoPQ/releases) +- [Список изменений](CHANGELOG.ru.md) ## Установка diff --git a/SportiduinoPQ.py b/SportiduinoPQ.py index 22711ec..35a94c0 100755 --- a/SportiduinoPQ.py +++ b/SportiduinoPQ.py @@ -24,7 +24,7 @@ _translate = QCoreApplication.translate -sportiduinopq_version_string = "v0.10.1" +sportiduinopq_version_string = "v0.10.2" class SportiduinoPqMainWindow(QtWidgets.QMainWindow):