Merge branch 'master' into feature/lua_scripting

This commit is contained in:
Mm2PL 2023-02-13 12:04:49 +00:00 committed by GitHub
commit 2d79cf53a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions

View file

@ -15,6 +15,9 @@ packaging_dir="package"
# Get the Ubuntu Release (e.g. 20.04 or 22.04) # Get the Ubuntu Release (e.g. 20.04 or 22.04)
ubuntu_release="$(lsb_release -rs)" ubuntu_release="$(lsb_release -rs)"
# The final path where we'll save the .deb package
deb_path="Chatterino-ubuntu-${ubuntu_release}-x86_64.deb"
# Refactor opportunity: # Refactor opportunity:
case "$ubuntu_release" in case "$ubuntu_release" in
20.04) 20.04)
@ -77,15 +80,15 @@ breakline
echo "Building package" echo "Building package"
dpkg-deb --build "$packaging_dir" "Chatterino-x86_64.deb" dpkg-deb --build "$packaging_dir" "$deb_path"
breakline breakline
echo "Package info" echo "Package info"
dpkg --info Chatterino-x86_64.deb dpkg --info "$deb_path"
breakline breakline
echo "Package contents" echo "Package contents"
dpkg --contents Chatterino-x86_64.deb # Shows folders and files inside .deb file dpkg --contents "$deb_path"
breakline breakline

View file

@ -302,7 +302,7 @@ jobs:
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: Chatterino-${{ matrix.os }}-Qt-${{ matrix.qt-version }}-${{ env.artifact_descr }}.deb name: Chatterino-${{ matrix.os }}-Qt-${{ matrix.qt-version }}-${{ env.artifact_descr }}.deb
path: build/Chatterino-x86_64.deb path: build/Chatterino-${{ matrix.is }}-x86_64.deb
# MACOS # MACOS
- name: Install dependencies (MacOS) - name: Install dependencies (MacOS)
@ -354,6 +354,11 @@ jobs:
name: chatterino-windows-x86-64-5.15.2.zip name: chatterino-windows-x86-64-5.15.2.zip
path: release-artifacts/ path: release-artifacts/
- uses: actions/download-artifact@v3
with:
name: chatterino-windows-x86-64-5.15.2-symbols.pdb.7z
path: release-artifacts/
- uses: actions/download-artifact@v3 - uses: actions/download-artifact@v3
with: with:
name: Chatterino-x86_64-5.15.2.AppImage name: Chatterino-x86_64-5.15.2.AppImage

@ -1 +1 @@
Subproject commit 918fd319d679306c8c95ee92376c6fa6ef3407a0 Subproject commit ec992578688b4c51c1856d08731cf7dcf10e446a