diff --git a/.travis.yml b/.travis.yml index c4c1423c..b438e9a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,4 +21,4 @@ before_install: - ./packaging/add-osx-cert.sh; script: - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then npm test; fi' - - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then npm test && travis_wait 30 ./packaging/release --branch=$TRAVIS_BRANCH --dist=mac --platform=mac --token=$GH_TOKEN; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then npm test && travis_wait 30 ./packaging/release --branch=$TRAVIS_BRANCH --dist=mac --platform=mac --token=$GH_TOKEN && travis_wait 30 ./packaging/release --branch=$TRAVIS_BRANCH --dist=mac --platform=macArm --token=$GH_TOKEN; fi' diff --git a/CHANGELOG.md b/CHANGELOG.md index b726704f..8ce7f33b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## New Updates -### 9.2.2 - ਊਨਾ Release _June 24, 2024_ +### 9.2.2 - ਊਨਾ Release _July 01, 2024_ #### Misc. bug fix and other improvements - Enhanced Bani Controller: Improved functionality when using the Bani Controller in a multipane workspace. diff --git a/package.json b/package.json index 6e9eac33..1ec24e66 100644 --- a/package.json +++ b/package.json @@ -14,12 +14,14 @@ "start": "npm run build:local && concurrently --kill-others \"npm run watch-css\" \"npm run watch-js\" \"cross-env NODE_ENV=development electron .\"", "build": "npm run build-css & npm run build-js", "build:local": "npm run build-css & npm run build-js:sm", - "pack:mac": "npm run build && electron-builder --mac", + "pack:mac": "npm run build && electron-builder --mac --x64", + "pack:macArm": "npm run build && electron-builder --mac --arm64", "pack:win": "npm run build && electron-builder --win --x64", "pack:win32": "npm run build && electron-builder --win --ia32", "pack:linux": "npm run build && electron-builder --linux --x64", "pack:berry": "export USE_SYSTEM_FPM=true && npm run build && electron-builder --linux --arm64", - "dist:mac": "npm run build && electron-builder --mac --publish always", + "dist:mac": "npm run build && electron-builder --mac --x64 --publish always", + "dist:macArm": "npm run build && electron-builder --mac --arm64 --publish always", "dist:win": "npm run pack:win && electron-builder --win --x64 --publish always", "dist:win32": "npm run pack:win32 && electron-builder --win --ia32 --publish always", "build-css": "run-p build-css:*", diff --git a/packaging/release b/packaging/release index cb2436b4..dd5970e2 100755 --- a/packaging/release +++ b/packaging/release @@ -19,8 +19,8 @@ const release = async () => { console.log(`Prerelease Track: ${track}`); } - // win-ia32 is run on the same machine right after win-x64, so don't update the version - if (platform !== 'win32') { + // win-ia32 and macArm is run on the same machine right after win-x64, so don't update the version + if (platform !== 'win32' && platform !== 'macArm') { // Get all tags, sort in desc order, and get latest from current track const gitTags = await git().tags(); const gitTag = gitTags.all.reverse().find((tag) => tag.indexOf(track) > -1); diff --git a/packaging/update-remote.js b/packaging/update-remote.js index 77960095..95d42087 100644 --- a/packaging/update-remote.js +++ b/packaging/update-remote.js @@ -6,6 +6,7 @@ const { version } = require('../package.json'); const files = { mac: 'sttm-mac-x64', + macArm: 'sttm-mac-arm64', win: 'sttm-win-x64', win32: 'sttm-win-ia32', }; diff --git a/www/main/addons/announcement/components/MiscSlides.jsx b/www/main/addons/announcement/components/MiscSlides.jsx index a59c3183..f476e2f9 100644 --- a/www/main/addons/announcement/components/MiscSlides.jsx +++ b/www/main/addons/announcement/components/MiscSlides.jsx @@ -21,7 +21,7 @@ const MiscSlides = () => { const [paneSelectorActive, setPaneSelectorActive] = useState(false); const paneSelector = useRef(null); - const openSlideFromDropdown = (paneId) => { + const openSlideFromDropdown = (e, paneId) => { displayAnandSahibBhog({ openedFrom: 'shortcut-tray', paneId }); setPaneSelectorActive(false); };