From 48e45bfa7ae14705d6c5caa020afda0dabc94144 Mon Sep 17 00:00:00 2001 From: theofficialgman <28281419+theofficialgman@users.noreply.github.com> Date: Wed, 27 May 2026 17:33:37 -0400 Subject: [PATCH 1/2] Unify Linux ARM CI into Linux CI (also drop QEMU) (#4702) --- .github/workflows/Linux-arm-pack.yml | 153 --------------------------- .github/workflows/Linux-pack.yml | 51 ++++++++- 2 files changed, 47 insertions(+), 157 deletions(-) delete mode 100644 .github/workflows/Linux-arm-pack.yml diff --git a/.github/workflows/Linux-arm-pack.yml b/.github/workflows/Linux-arm-pack.yml deleted file mode 100644 index 9fc39f4a64..0000000000 --- a/.github/workflows/Linux-arm-pack.yml +++ /dev/null @@ -1,153 +0,0 @@ -name: Packaging(Linux - ARM) - -on: - #push: - # branches: - # - master - # - fix* - # - move-arm-ci-to-new-ci - # paths-ignore: - # - 'README.md' - # - 'LICENSE' - # - 'docs/**' - - workflow_dispatch: - -env: - PRODUCT: flameshot - RELEASE: 1 - # dockerfiles, see https://github.com/flameshot-org/flameshot-dockerfiles - # docker images, see https://quay.io/repository/flameshot-org/ci-building - DOCKER_REPO: quay.io/flameshot-org/ci-building - # building tool: https://github.com/flameshot-org/packpack - PACKPACK_REPO: flameshot-org/packpack - -jobs: - deb-pack: - name: Build deb on ${{ matrix.dist.name }} ${{ matrix.dist.arch }} - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - dist: -# - { -# name: debian-11, -# os: debian, -# symbol: bullseye, -# arch: armhf -# } - - { - name: debian-12, - os: debian, - symbol: bookworm, - arch: arm64 - } - - { - name: debian-12, - os: debian, - symbol: bookworm, - arch: armhf - } - - { - name: ubuntu-22.04, - os: ubuntu, - symbol: jammy, - arch: arm64 - } - - { - name: ubuntu-24.04, - os: ubuntu, - symbol: noble, - arch: arm64 - } - - steps: - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v4 - - - name: Checkout Source code - if: github.event_name == 'push' - uses: actions/checkout@v6 - with: - fetch-depth: 0 -# ref: master - - - name: Checkout Source code - if: github.event_name == 'pull_request' - uses: actions/checkout@v6 - with: - fetch-depth: 0 - ref: ${{ github.event.pull_request.head.sha }} - - - name: Checkout Source code - if: github.event_name == 'workflow_dispatch' - uses: actions/checkout@v6 - with: - ref: ${{ github.sha }} - - - name: Set env & Print flameshot version - shell: bash - run: | - last_committed_tag=$(git tag -l --sort=-v:refname | head -1) - git_revno=$(git rev-list $(git describe --tags --abbrev=0)..HEAD --count) - git_hash=$(git rev-parse --short HEAD) - ver_info=${last_committed_tag}+git${git_revno}.${git_hash} - echo "=======FLAMESHOT VERSION========" - echo ${last_committed_tag:1} - echo "Details: ${ver_info}" - echo "================================" - # This will allow to build pre-preleases without git tag - # echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV - echo "VERSION=$(cat CMakeLists.txt |grep 'set.*(.*FLAMESHOT_VERSION' | sed 's/[^0-9.]*//' |sed 's/)//g')" >> $GITHUB_ENV - echo "VER_INFO=${ver_info}" >> $GITHUB_ENV - echo "GIT_HASH=${git_hash}" >> $GITHUB_ENV - - - - name: Get packpack tool - uses: actions/checkout@v6 - with: - repository: ${{ env.PACKPACK_REPO }} - path: tools - ref: multiarch - set-safe-directory: $GITHUB_WORKSPACE/tools - - - name: Packaging on ${{ matrix.dist.name }} ${{ matrix.dist.arch }} - env: - OS: ${{ matrix.dist.os }} - DIST: ${{ matrix.dist.symbol }} - DOCKER_ARCH: ${{ matrix.dist.arch }} - run: | - case ${DOCKER_ARCH} in - arm32v7) - export ARCH=arm/v7 - ;; - armhf) - export ARCH=arm/v7 - ;; - arm64*) - export ARCH=arm64 - ;; - *) - 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 - - - name: SHA256Sum of ${{ matrix.dist.name }} ${{ matrix.dist.arch }} package - run: | - cd "$GITHUB_WORKSPACE/build/" || { >&2 echo "Cannot cd to '$GITHUB_WORKSPACE/build/'!"; exit 11 ; } - sha256sum ${PRODUCT}-${VERSION}-${RELEASE}.${{ matrix.dist.name }}.${{ matrix.dist.arch }}.deb | tee ${PRODUCT}-${VERSION}-${RELEASE}.${{ matrix.dist.name }}.${{ matrix.dist.arch }}.deb.sha256sum - - - name: Artifact Upload - uses: actions/upload-artifact@v7 - with: - name: ${{ env.PRODUCT }}-${{ env.VER_INFO }}-artifact-${{ matrix.dist.name }}-${{ matrix.dist.arch }} - path: | - ${{ github.workspace }}/build/${{ env.PRODUCT }}-*-${{ env.RELEASE }}.${{ matrix.dist.name }}.${{ matrix.dist.arch }}.deb - ${{ github.workspace }}/build/${{ env.PRODUCT }}-*-${{ env.RELEASE }}.${{ matrix.dist.name }}.${{ matrix.dist.arch }}.deb.sha256sum - overwrite: true diff --git a/.github/workflows/Linux-pack.yml b/.github/workflows/Linux-pack.yml index 7be3ac6473..c0b5b9e447 100644 --- a/.github/workflows/Linux-pack.yml +++ b/.github/workflows/Linux-pack.yml @@ -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: @@ -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: @@ -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 From 090033fe993c2a0ab20b1ea5fdd0e252f9c7adfb Mon Sep 17 00:00:00 2001 From: borgmanJeremy <46930769+borgmanJeremy@users.noreply.github.com> Date: Wed, 27 May 2026 18:05:00 -0500 Subject: [PATCH 2/2] respect system proxy settings (#4674) --- src/main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index c57601611a..2468979fa7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -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) {