From 4ae3b4cfe03a83a49018d8e7ed6d0ab75ea12bc8 Mon Sep 17 00:00:00 2001 From: Daniel Weck Date: Sat, 8 Feb 2025 23:24:31 +0000 Subject: [PATCH] chore(release): v1.3.6 --- .github/workflows/main.yml | 81 ++++++++++++++++++++++++-------------- CHANGELOG.md | 7 +++- package-asar-dev.json | 2 +- package-asar.json | 2 +- package.json | 2 +- 5 files changed, 60 insertions(+), 34 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6144d31..8b61919 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,14 +31,32 @@ jobs: build: # if: "!contains(toJSON(github.event.commits.*.message), '[skip-ci]')" if: "github.event_name == 'pull_request' || !contains(github.event.head_commit.message, 'skip ci')" - # runs-on: ubuntu-latest # / ubuntu-18.04 ... or ubuntu-16.04, ubuntu-20.04 - # runs-on: macos-latest # / macos-10.15 - # runs-on: windows-2016 # not window-latest / windows-2019 runs-on: ${{ matrix.runson }} strategy: fail-fast: false matrix: - osarch: [windows-intel, windows-arm, macos-intel, macos-arm, linux-intel, linux-arm] + # ------------------------------ + # uncomment below to use GitHub Actions to generate all but MacOS artefacts (MacOS = KeyChain code-signing certificate + notarization, Windows = signed in a VM manually using a USB hardware token) + osarch: [windows-intel, windows-arm, linux-intel, linux-arm] + include: + - osarch: windows-intel + runson: windows-latest #windows-2022 + packname: win + release_tag: latest-windows-intel-prod + - osarch: windows-arm + runson: windows-latest #windows-2022 + packname: win + release_tag: latest-windows-arm-prod + - osarch: linux-intel + runson: ubuntu-20.04 #ubuntu-latest is ubuntu-24.04 + packname: linux + release_tag: latest-linux-intel-prod + - osarch: linux-arm + runson: ubuntu-20.04 #ubuntu-latest is ubuntu-24.04 + packname: linux + release_tag: latest-linux-arm-prod + # ------------------------------ +# osarch: [windows-intel, windows-arm, macos-intel, macos-arm, linux-intel, linux-arm] # AceApp for MacOS x64 and arm64 is built on GitHub Actions arm64 runners # AceApp for Linux x64 and arm64 is built on GitHub Actions x64 runners # AceApp for Windows x64 and arm64 is built on GitHub Actions x64 runners @@ -63,31 +81,31 @@ jobs: # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md # ubuntu-20.04 is the oldest available (used here) # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2004-Readme.md - include: - - osarch: windows-intel - runson: windows-latest #windows-2022 - packname: win - release_tag: latest-windows-intel - - osarch: windows-arm - runson: windows-latest #windows-2022 - packname: win - release_tag: latest-windows-arm - - osarch: macos-intel - runson: macos-latest #macos-14-arm64 - packname: 'mac:skip-notarize' - release_tag: latest-macos-intel - - osarch: macos-arm - runson: macos-latest #macos-14-arm64 - packname: 'mac:skip-notarize' - release_tag: latest-macos-arm - - osarch: linux-intel - runson: ubuntu-20.04 #ubuntu-latest is ubuntu-24.04 - packname: linux - release_tag: latest-linux-intel - - osarch: linux-arm - runson: ubuntu-20.04 #ubuntu-latest is ubuntu-24.04 - packname: linux - release_tag: latest-linux-arm + # include: + # - osarch: windows-intel + # runson: windows-latest #windows-2022 + # packname: win + # release_tag: latest-windows-intel + # - osarch: windows-arm + # runson: windows-latest #windows-2022 + # packname: win + # release_tag: latest-windows-arm + # - osarch: macos-intel + # runson: macos-latest #macos-14-arm64 + # packname: 'mac:skip-notarize' + # release_tag: latest-macos-intel + # - osarch: macos-arm + # runson: macos-latest #macos-14-arm64 + # packname: 'mac:skip-notarize' + # release_tag: latest-macos-arm + # - osarch: linux-intel + # runson: ubuntu-20.04 #ubuntu-latest is ubuntu-24.04 + # packname: linux + # release_tag: latest-linux-intel + # - osarch: linux-arm + # runson: ubuntu-20.04 #ubuntu-latest is ubuntu-24.04 + # packname: linux + # release_tag: latest-linux-arm env: RELEASE_TAG: ${{ matrix.release_tag }} steps: @@ -167,14 +185,17 @@ jobs: # - run: export PATH="$HOME/.yarn/bin:$PATH" - run: yarn --version - run: yarn config set network-timeout 300000 || echo ok - # - run: yarn --global install asar +# - run: yarn --global install asar - name: package patch 1 + if: ${{ !endsWith(matrix.release_tag, '-prod') }} run: node build/package-ci-patch.js package.json ${{ github.run_id }} && cat package.json | grep -i VERSION && cat package.json shell: bash - name: package patch 2 + if: ${{ !endsWith(matrix.release_tag, '-prod') }} run: node build/package-ci-patch.js package-asar.json ${{ github.run_id }} && cat package-asar.json | grep -i VERSION && cat package-asar.json shell: bash - name: package patch 3 + if: ${{ !endsWith(matrix.release_tag, '-prod') }} run: node build/package-ci-patch.js package-asar-dev.json ${{ github.run_id }} && cat package-asar-dev.json | grep -i VERSION && cat package-asar-dev.json shell: bash - run: git submodule init && git submodule update diff --git a/CHANGELOG.md b/CHANGELOG.md index 3424578..0128a96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,12 @@ Code diff since previous version: -https://github.com/daisy/ace-gui/compare/v1.3.5...master +https://github.com/daisy/ace-gui/compare/v1.3.6...master + + +# 1.3.6 (2025-02-08) + +Please visit the [release page](https://github.com/daisy/ace-gui/releases/tag/v1.3.6). # 1.3.5 (2025-02-06) diff --git a/package-asar-dev.json b/package-asar-dev.json index b554964..60a0a3f 100644 --- a/package-asar-dev.json +++ b/package-asar-dev.json @@ -2,7 +2,7 @@ "name": "ace-gui", "productName": "Ace by DAISY", "description": "Ace, the EPUB accessibility checker by the DAISY Consortium (desktop application)", - "version": "1.3.6-alpha.1", + "version": "1.3.6", "author": { "name": "DAISY Consortium", "organization": "DAISY Consortium", diff --git a/package-asar.json b/package-asar.json index a42478d..b8b0b25 100644 --- a/package-asar.json +++ b/package-asar.json @@ -2,7 +2,7 @@ "name": "ace-gui", "productName": "Ace by DAISY", "description": "Ace, the EPUB accessibility checker by the DAISY Consortium (desktop application)", - "version": "1.3.6-alpha.1", + "version": "1.3.6", "author": { "name": "DAISY Consortium", "organization": "DAISY Consortium", diff --git a/package.json b/package.json index c1fd6f3..030eaa0 100755 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ace-gui", "description": "Ace, the EPUB accessibility checker by the DAISY Consortium (desktop application)", - "version": "1.3.6-alpha.1", + "version": "1.3.6", "engines": { "node": ">=22.0.0", "yarn": "^1.22.0",