Skip to content

Commit

Permalink
chore(release): v1.3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
danielweck committed Feb 8, 2025
1 parent 5d3e12c commit 4ae3b4c
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 34 deletions.
81 changes: 51 additions & 30 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

<a name="1.3.6"></a>
# 1.3.6 (2025-02-08)

Please visit the [release page](https://github.com/daisy/ace-gui/releases/tag/v1.3.6).

<a name="1.3.5"></a>
# 1.3.5 (2025-02-06)
Expand Down
2 changes: 1 addition & 1 deletion package-asar-dev.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion package-asar.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

0 comments on commit 4ae3b4c

Please sign in to comment.