Skip to content

Commit

Permalink
fix: MacOS 12 build
Browse files Browse the repository at this point in the history
  • Loading branch information
Yuriy Puchkov committed May 14, 2024
1 parent b0da6e2 commit af09367
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/Linux-pack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ on:
paths-ignore:
- 'README.md'
- 'LICENSE'

workflow_dispatch:
pull_request:
branches:
- master
paths-ignore:
- 'README.md'
- 'LICENSE'
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/MacOS-pack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ on:
push:
branches:
- master
- feature/RND-680-macos-.dmg-package-build
paths-ignore:
- 'README.md'
- 'LICENSE'

workflow_dispatch:
pull_request:
branches:
- master
paths-ignore:
- 'README.md'
- 'LICENSE'
Expand Down Expand Up @@ -53,6 +54,7 @@ jobs:
- name: Configure
run: |
rm -rf "${DIR_BULD}"/src/flameshot.dmg "${DIR_BULD}"/src/flameshot.app/
cp "./packaging/macos/flameshot.icns" "${DIR_BULD}/build/flameshot.icns"
cmake -S . -B "${DIR_BULD}" -DQt5_DIR=$(brew --prefix qt5)/lib/cmake/Qt5 -DUSE_MONOCHROME_ICON=True
- name: Compile
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/Windows-pack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ name: Packaging(Windows)
on:
push:
branches:
- master*
- master
paths-ignore:
- 'README.md'
- 'LICENSE'

workflow_dispatch:
pull_request:
branches:
- master
paths-ignore:
- 'README.md'
- 'LICENSE'
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ cmake_minimum_required(VERSION 3.13)
set(FLAMESHOT_VERSION 12.1.0.5)

# Flameshot-org
set(GIT_API_URL "https://api.github.com/repos/flameshot-org/flameshot/releases/latest")
# set(GIT_API_URL "https://api.github.com/repos/flameshot-org/flameshot/releases/latest")
# Namecheap
# set(GIT_API_URL "https://api.github.com/repos/namecheap/flameshot/releases/latest")
set(GIT_API_URL "https://api.github.com/repos/namecheap/flameshot/releases/latest")

# TODO - fix it for all linux distros
#find_package (Git)
Expand Down

0 comments on commit af09367

Please sign in to comment.