chatterino2
Code Issues

Use macos rather than osx in filenames (#4550)

Browse Source
This commit is contained in:
nerix
2023-04-16 21:05:51 +02:00
committed by GitHub
parent 517382ebc9
commit 20bdfaef39
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.CI/CreateDMG.sh
+1 -1
View File
@@ -28,5 +28,5 @@ echo "Entering python3 virtual environment"
echo "Installing dmgbuild" echo "Installing dmgbuild"
python3 -m pip install dmgbuild python3 -m pip install dmgbuild
echo "Running dmgbuild.." echo "Running dmgbuild.."
dmgbuild --settings ./../.CI/dmg-settings.py -D app=./chatterino.app Chatterino2 chatterino-osx-Qt-$1.dmg dmgbuild --settings ./../.CI/dmg-settings.py -D app=./chatterino.app Chatterino2 chatterino-macos-Qt-$1.dmg
echo "Done!" echo "Done!"
.github/workflows/build.yml
+4 -4
View File
@@ -348,8 +348,8 @@ jobs:
if: startsWith(matrix.os, 'macos') if: startsWith(matrix.os, 'macos')
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: chatterino-osx-Qt-${{ matrix.qt-version }}.dmg name: chatterino-macos-Qt-${{ matrix.qt-version }}.dmg
path: build/chatterino-osx-Qt-${{ matrix.qt-version }}.dmg path: build/chatterino-macos-Qt-${{ matrix.qt-version }}.dmg
create-release: create-release:
needs: build needs: build
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -411,13 +411,13 @@ jobs:
- uses: actions/download-artifact@v3 - uses: actions/download-artifact@v3
name: macOS x86_64 Qt5.15.2 dmg name: macOS x86_64 Qt5.15.2 dmg
with: with:
name: chatterino-osx-Qt-5.15.2.dmg name: chatterino-macos-Qt-5.15.2.dmg
path: release-artifacts/ path: release-artifacts/
- uses: actions/download-artifact@v3 - uses: actions/download-artifact@v3
name: macOS x86_64 Qt6.5.0 dmg name: macOS x86_64 Qt6.5.0 dmg
with: with:
name: chatterino-osx-Qt-6.5.0.dmg name: chatterino-macos-Qt-6.5.0.dmg
path: release-artifacts/ path: release-artifacts/
- name: Copy flatpakref - name: Copy flatpakref
CHANGELOG.md
+1
View File
@@ -37,6 +37,7 @@
- Dev: Added tests and benchmarks for `LinkParser`. (#4436) - Dev: Added tests and benchmarks for `LinkParser`. (#4436)
- Dev: Experimental builds with Qt 6 are now provided. (#4522) - Dev: Experimental builds with Qt 6 are now provided. (#4522)
- Dev: Removed `CHATTERINO_TEST` definitions. (#4526) - Dev: Removed `CHATTERINO_TEST` definitions. (#4526)
- Dev: Builds for macOS now have `macos` in their name (previously: `osx`). (#4550)
## 2.4.2 ## 2.4.2
src/singletons/Toasts.cpp
+1 -1
View File
@@ -76,7 +76,7 @@ void Toasts::sendChannelNotification(const QString &channelName,
}; };
#else #else
auto sendChannelNotification = [] { auto sendChannelNotification = [] {
// Unimplemented for OSX and Linux // Unimplemented for macOS and Linux
}; };
#endif #endif
// Fetch user profile avatar // Fetch user profile avatar