fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2025-12-26 03:39:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix windows build badge and typos

Browse Source 
* Drop qmake build-dependency from CI, they should not be installed
  since we have switched to CMake.
* Update README.md badges to reflect recent Windows CI updates.
* Set doc badge to point to flameshot.org website.
* Fix a typo in src/CMakeLists.txt.
This commit is contained in:
Boyuan Yang
2020-09-13 09:12:48 -04:00
committed by borgmanJeremy
parent 53a9d44c46
commit f18f186b46
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/Linux-pack.yml vendored
View File

@@ -138,7 +138,6 @@ jobs:
extra-cmake-modules \ extra-cmake-modules \
build-essential \ build-essential \
qt5-default \ qt5-default \
qt5-qmake \
qttools5-dev-tools \ qttools5-dev-tools \
qttools5-dev \ qttools5-dev \
libqt5dbus5 \ libqt5dbus5 \
@@ -239,4 +238,4 @@ jobs:
run: | run: |
echo "=======================snap downlod link======================" echo "=======================snap downlod link======================"
echo $(sh $GITHUB_WORKSPACE/scripts/upload_services/${UPLOAD_SERVICE}.sh ${{ steps.snapcraft.outputs.snap }}) echo $(sh $GITHUB_WORKSPACE/scripts/upload_services/${UPLOAD_SERVICE}.sh ${{ steps.snapcraft.outputs.snap }})
echo "=====no operation for you can see link in the log console=====" echo "=====no operation for you can see link in the log console====="

3
.github/workflows/build_cmake.yml vendored
View File

@@ -35,7 +35,6 @@ jobs:
extra-cmake-modules \ extra-cmake-modules \
build-essential \ build-essential \
qt5-default \ qt5-default \
qt5-qmake \
qttools5-dev-tools \ qttools5-dev-tools \
qttools5-dev \ qttools5-dev \
libqt5dbus5 \ libqt5dbus5 \
@@ -122,4 +121,4 @@ jobs:
working-directory: build working-directory: build
shell: powershell shell: powershell
run: | run: |
cmake --build . --config $env:BUILD_TYPE cmake --build . --config $env:BUILD_TYPE

8
README.md
View File

@@ -11,10 +11,10 @@
</p> </p>
<p> <p>
<a href="https://github.com/flameshot-org/flameshot/actions"> <a href="https://github.com/flameshot-org/flameshot/actions">
<img src="https://img.shields.io/github/workflow/status/flameshot-org/flameshot/Packaging?label=gnu%2Flinux" alt="GNU/Linux Build Status" /> <img src="https://img.shields.io/github/workflow/status/flameshot-org/flameshot/Packaging(Linux)?label=gnu%2Flinux" alt="GNU/Linux Build Status" />
</a> </a>
<a href="https://ci.appveyor.com/project/lupoDharkael/flameshot"> <a href="https://github.com/flameshot-org/flameshot/actions">
<img src="https://img.shields.io/appveyor/ci/lupoDharkael/flameshot.svg?style=flat-square&label=windows" alt="Windows Build Status" /> <img src="https://img.shields.io/github/workflow/status/flameshot-org/flameshot/Packaging(Windows)?label=windows" alt="Windows Build Status" />
</a> </a>
<a href="https://github.com/flameshot-org/flameshot/releases"> <a href="https://github.com/flameshot-org/flameshot/releases">
<img src="https://img.shields.io/github/release/flameshot-org/flameshot.svg?style=flat-square" alt="Latest Stable Release" /> <img src="https://img.shields.io/github/release/flameshot-org/flameshot.svg?style=flat-square" alt="Latest Stable Release" />
@@ -25,7 +25,7 @@
<a href="https://github.com/flameshot-org/flameshot/blob/master/LICENSE"> <a href="https://github.com/flameshot-org/flameshot/blob/master/LICENSE">
<img src="https://img.shields.io/github/license/flameshot-org/flameshot.svg?style=flat-square" alt="License" /> <img src="https://img.shields.io/github/license/flameshot-org/flameshot.svg?style=flat-square" alt="License" />
</a> </a>
<a href="https://flameshot-org.github.io"> <a href="https://flameshot.org">
<img src="https://img.shields.io/github/release/flameshot-org/flameshot.svg?style=flat-square&label=docs" alt="Docs" /> <img src="https://img.shields.io/github/release/flameshot-org/flameshot.svg?style=flat-square&label=docs" alt="Docs" />
</a> </a>
</p> </p>

2
src/CMakeLists.txt
View File

@@ -67,7 +67,7 @@ target_sources(
${CMAKE_CURRENT_SOURCE_DIR}/../external/Qt-Color-Widgets/src/color_wheel.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../external/Qt-Color-Widgets/src/color_wheel.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../external/Qt-Color-Widgets/include/color_wheel.hpp ${CMAKE_CURRENT_SOURCE_DIR}/../external/Qt-Color-Widgets/include/color_wheel.hpp
${CMAKE_CURRENT_SOURCE_DIR}/../data/graphics.qrc ${CMAKE_CURRENT_SOURCE_DIR}/../data/graphics.qrc
${CMAKE_CURRENT_SOURCE_DIR}/../data/icon.rc # flamshot binary icon resource file ${CMAKE_CURRENT_SOURCE_DIR}/../data/icon.rc # windows binary icon resource file
${QM_FILES} ${QM_FILES}
main.cpp) main.cpp)