From ae7567121b9eadd9fb7e02d56f12c77408602d56 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 10:10:03 +0100 Subject: [PATCH 1/3] Bump lib/crashpad from `918fd31` to `ec99257` (#4370) Bumps [lib/crashpad](https://github.com/getsentry/crashpad) from `918fd31` to `ec99257`. - [Release notes](https://github.com/getsentry/crashpad/releases) - [Commits](https://github.com/getsentry/crashpad/compare/918fd319d679306c8c95ee92376c6fa6ef3407a0...ec992578688b4c51c1856d08731cf7dcf10e446a) --- updated-dependencies: - dependency-name: lib/crashpad dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- lib/crashpad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/crashpad b/lib/crashpad index 918fd319d..ec9925786 160000 --- a/lib/crashpad +++ b/lib/crashpad @@ -1 +1 @@ -Subproject commit 918fd319d679306c8c95ee92376c6fa6ef3407a0 +Subproject commit ec992578688b4c51c1856d08731cf7dcf10e446a From ef3a607af51e9d15de33d08aeb1914108fd7db2b Mon Sep 17 00:00:00 2001 From: pajlada Date: Mon, 13 Feb 2023 10:34:40 +0100 Subject: [PATCH 2/3] Upload both Ubuntu .deb packages & Windows .pdb symbols in releases (#4372) --- .CI/CreateUbuntuDeb.sh | 9 ++++++--- .github/workflows/build.yml | 7 ++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.CI/CreateUbuntuDeb.sh b/.CI/CreateUbuntuDeb.sh index ac627d649..7bd690106 100755 --- a/.CI/CreateUbuntuDeb.sh +++ b/.CI/CreateUbuntuDeb.sh @@ -15,6 +15,9 @@ packaging_dir="package" # Get the Ubuntu Release (e.g. 20.04 or 22.04) ubuntu_release="$(lsb_release -rs)" +# The final path where we'll save the .deb package +deb_path="Chatterino-${ubuntu_release}-x86_64.deb" + # Refactor opportunity: case "$ubuntu_release" in 20.04) @@ -77,15 +80,15 @@ breakline echo "Building package" -dpkg-deb --build "$packaging_dir" "Chatterino-x86_64.deb" +dpkg-deb --build "$packaging_dir" "$deb_path" breakline echo "Package info" -dpkg --info Chatterino-x86_64.deb +dpkg --info "$deb_path" breakline echo "Package contents" -dpkg --contents Chatterino-x86_64.deb # Shows folders and files inside .deb file +dpkg --contents "$deb_path" breakline diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ecbcc937..9424f2c28 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -264,7 +264,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: Chatterino-${{ matrix.os }}-Qt-${{ matrix.qt-version }}.deb - path: build/Chatterino-x86_64.deb + path: build/Chatterino-${{ matrix.os }}-x86_64.deb # MACOS - name: Install dependencies (MacOS) @@ -316,6 +316,11 @@ jobs: name: chatterino-windows-x86-64-5.15.2.zip path: release-artifacts/ + - uses: actions/download-artifact@v3 + with: + name: chatterino-windows-x86-64-5.15.2-symbols.pdb.zip + path: release-artifacts/ + - uses: actions/download-artifact@v3 with: name: Chatterino-x86_64-5.15.2.AppImage From 56adaf81ac7e1f7d26ad703131af8eac4a73fa23 Mon Sep 17 00:00:00 2001 From: pajlada Date: Mon, 13 Feb 2023 11:33:25 +0100 Subject: [PATCH 3/3] Fix .deb & pdb release uploads (#4373) --- .CI/CreateUbuntuDeb.sh | 2 +- .github/workflows/build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.CI/CreateUbuntuDeb.sh b/.CI/CreateUbuntuDeb.sh index 7bd690106..e8929783b 100755 --- a/.CI/CreateUbuntuDeb.sh +++ b/.CI/CreateUbuntuDeb.sh @@ -16,7 +16,7 @@ packaging_dir="package" ubuntu_release="$(lsb_release -rs)" # The final path where we'll save the .deb package -deb_path="Chatterino-${ubuntu_release}-x86_64.deb" +deb_path="Chatterino-ubuntu-${ubuntu_release}-x86_64.deb" # Refactor opportunity: case "$ubuntu_release" in diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9424f2c28..167b23078 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -318,7 +318,7 @@ jobs: - uses: actions/download-artifact@v3 with: - name: chatterino-windows-x86-64-5.15.2-symbols.pdb.zip + name: chatterino-windows-x86-64-5.15.2-symbols.pdb.7z path: release-artifacts/ - uses: actions/download-artifact@v3