Skip to content

[pull] master from flameshot-org:master #241

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.

Sign up for GitHub

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

Merged
pull merged 2 commits into from
May 28, 2026
+49 −157
Merged

[pull] master from flameshot-org:master #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48e45bf
Unify Linux ARM CI into Linux CI (also drop QEMU) (#4702)
theofficialgman May 27, 2026
090033f
respect system proxy settings (#4674)
borgmanJeremy May 27, 2026
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
153 changes: 0 additions & 153 deletions .github/workflows/Linux-arm-pack.yml
View file
Open in desktop

This file was deleted.

51 changes: 47 additions & 4 deletions .github/workflows/Linux-pack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ env:
jobs:
deb-pack:
name: Build deb on ${{ matrix.dist.name }} ${{ matrix.dist.arch }}
runs-on: ubuntu-latest
runs-on: ${{ matrix.dist.runs-on }}
strategy:
fail-fast: false
matrix:
Expand All @@ -40,19 +40,50 @@ jobs:
name: debian-12,
os: debian,
symbol: bookworm,
arch: amd64
arch: amd64,
runs-on: ubuntu-latest
}
- {
name: ubuntu-22.04,
os: ubuntu,
symbol: jammy,
arch: amd64,
runs-on: ubuntu-latest
}
- {
name: ubuntu-24.04,
os: ubuntu,
symbol: noble,
arch: amd64,
runs-on: ubuntu-latest
}
- {
name: debian-12,
os: debian,
symbol: bookworm,
arch: arm64,
runs-on: ubuntu-24.04-arm
}
- {
name: debian-12,
os: debian,
symbol: bookworm,
arch: armhf,
runs-on: ubuntu-24.04-arm
}
- {
name: ubuntu-22.04,
os: ubuntu,
symbol: jammy,
arch: amd64
arch: arm64,
runs-on: ubuntu-24.04-arm
}
- {
name: ubuntu-24.04,
os: ubuntu,
symbol: noble,
arch: amd64
arch: arm64,
runs-on: ubuntu-24.04-arm
}

steps:
Expand Down Expand Up @@ -108,8 +139,20 @@ jobs:
env:
OS: ${{ matrix.dist.os }}
DIST: ${{ matrix.dist.symbol }}
DOCKER_ARCH: ${{ matrix.dist.arch }}
PRESERVE_ENVVARS: "GIT_HASH"
run: |
case ${DOCKER_ARCH} in
armhf)
export ARCH=armhf
;;
arm64)
export ARCH=aarch64
;;
*)
export ARCH=${DOCKER_ARCH}
;;
esac
cp -r $GITHUB_WORKSPACE/packaging/debian $GITHUB_WORKSPACE
bash $GITHUB_WORKSPACE/tools/packpack
mv $GITHUB_WORKSPACE/build/${PRODUCT}_${VERSION}-${RELEASE}_${{ matrix.dist.arch }}.deb $GITHUB_WORKSPACE/build/${PRODUCT}-${VERSION}-${RELEASE}.${{ matrix.dist.name }}.${{ matrix.dist.arch }}.deb
Expand Down
2 changes: 2 additions & 0 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include <QApplication>
#include <QDir>
#include <QLibraryInfo>
#include <QNetworkProxyFactory>
#include <QSharedMemory>
#include <QTimer>
#include <QTranslator>
Expand Down Expand Up @@ -209,6 +210,7 @@ int main(int argc, char* argv[])
QCoreApplication::setApplicationVersion(APP_VERSION);
QCoreApplication::setApplicationName(QStringLiteral("flameshot"));
QCoreApplication::setOrganizationName(QStringLiteral("flameshot"));
QNetworkProxyFactory::setUseSystemConfiguration(true);

// no arguments, just launch Flameshot
if (argc == 1) {
Expand Down
Loading