Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use macos rather than osx in filenames #4550

Merged
merged 3 commits into from
Apr 16, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .CI/CreateDMG.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ echo "Entering python3 virtual environment"
echo "Installing dmgbuild"
python3 -m pip install 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!"
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,8 @@ jobs:
if: startsWith(matrix.os, 'macos')
uses: actions/upload-artifact@v3
with:
name: chatterino-osx-Qt-${{ matrix.qt-version }}.dmg
path: build/chatterino-osx-Qt-${{ matrix.qt-version }}.dmg
name: chatterino-macos-Qt-${{ matrix.qt-version }}.dmg
path: build/chatterino-macos-Qt-${{ matrix.qt-version }}.dmg
create-release:
needs: build
runs-on: ubuntu-latest
Expand Down Expand Up @@ -411,13 +411,13 @@ jobs:
- uses: actions/download-artifact@v3
name: macOS x86_64 Qt5.15.2 dmg
with:
name: chatterino-osx-Qt-5.15.2.dmg
name: chatterino-macos-Qt-5.15.2.dmg
path: release-artifacts/

- uses: actions/download-artifact@v3
name: macOS x86_64 Qt6.5.0 dmg
with:
name: chatterino-osx-Qt-6.5.0.dmg
name: chatterino-macos-Qt-6.5.0.dmg
path: release-artifacts/

- name: Copy flatpakref
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
- Dev: Added tests and benchmarks for `LinkParser`. (#4436)
- Dev: Experimental builds with Qt 6 are now provided. (#4522)
- Dev: Removed `CHATTERINO_TEST` definitions. (#4526)
- Dev: Builds for macOS now have `macos` in their name (previously: `osx`). (#4550)

## 2.4.2

Expand Down