benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'flameshot-org-master' into bugfix/RND-664-flameshot-update-history-widget-on-new-capture

Browse Source
This commit is contained in:
Yuriy Puchkov
2020-10-16 15:05:12 +03:00
parent 5ea80b2ca2 2d4cd76e85
commit 472d0dca29
6 changed files with 1261 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ env:
# docker images, see https://hub.docker.com/r/vitzy/flameshot
# vitzy/flameshot or packpack/packpack
DOCKER_REPO: vitzy/flameshot
# upload services: 0x0.st, file.io, transfer.sh, wetransfer.com
# upload services: wetransfer.com, file.io, 0x0.st
UPLOAD_SERVICE: wetransfer.com
jobs:
@@ -67,7 +67,7 @@ jobs:
echo ${last_committed_tag:1}
echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}"
echo "================================"
echo ::set-env name=VERSION::$(echo ${last_committed_tag:1})
echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
- name: Get packpack tool
uses: actions/checkout@v2
with:
@@ -132,7 +132,7 @@ jobs:
echo ${last_committed_tag:1}
echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}"
echo "================================"
echo ::set-env name=VERSION::$(echo ${last_committed_tag:1})
echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
- name: Install dependencies
run: |
apt-get -y -qq update
@@ -234,7 +234,7 @@ jobs:
echo ${last_committed_tag:1}
echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}"
echo "================================"
echo ::set-env name=VERSION::$(echo ${last_committed_tag:1})
echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
- name: Get packpack tool
uses: actions/checkout@v2
with:
@@ -327,7 +327,7 @@ jobs:
echo ${last_committed_tag:1}
echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}"
echo "================================"
echo ::set-env name=VERSION::$(echo ${last_committed_tag:1})
echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
- name: Install Dependencies
run: |
sudo apt-get -y -qq update
@@ -427,7 +427,7 @@ jobs:
echo ${last_committed_tag:1}
echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}"
echo "================================"
echo ::set-env name=VERSION::$(echo ${last_committed_tag:1})
echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
- name: Setup flatpak
run: |
sudo apt-get -y -qq update
@@ -493,8 +493,7 @@ jobs:
echo ${last_committed_tag:1}
echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}"
echo "================================"
echo ::set-env name=VERSION::$(echo ${last_committed_tag:1})
echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
- name: Packaging snap
uses: snapcore/action-build@v1
id: snapcraft

2
.github/workflows/Windows-pack.yml vendored
View File

@@ -78,7 +78,7 @@ jobs:
echo ${last_committed_tag:1}
echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}"
echo "================================"
echo ::set-env name=VERSION::$(echo ${last_committed_tag:1})
echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
- name: Restore from cache and run vcpkg
uses: lukka/run-vcpkg@v4

7
README.md
View File

@@ -30,8 +30,11 @@
</a>
<br>
<a href="https://snapcraft.io/flameshot">
<img alt="Get it from the Snap Store" src="https://snapcraft.io/static/images/badges/en/snap-store-black.svg" />
</a>
<img alt="Get it from the Snap Store" src="https://snapcraft.io/static/images/badges/en/snap-store-black.svg" />
</a>
<a href="https://flathub.org/apps/details/org.flameshot.Flameshot">
<img height="60" alt="Download on Flathub" src="https://flathub.org/assets/badges/flathub-badge-en.svg"/>
</a>
</p>
</div>

1244
data/translations/Internationalization_zh_HK.ts Normal file
View File

File diff suppressed because it is too large Load Diff

3
docs/Releasing.md
View File

@@ -12,6 +12,9 @@ These are the steps for actually making the release
- [ ] Create sha256 for each binary and compare against sha256 shown in the CI to verify there was no corruption or inserted malware.
- [ ] Create a new "New Release" in githhub and explain changes in release notes
- [ ] Upload all binaries and sha's
- [ ] Update flatpak manifest for flathub: https://github.com/flathub/org.flameshot.Flameshot
- [ ] Push snapcraft edge release to stable
- [ ] If this is a major release coordinate with sign path on signed windows binaries
- [ ] Update change log on [website](https://github.com/flameshot-org/flameshot-org.github.io/) data/changelog.md
- [ ] Update version on [website](https://github.com/flameshot-org/flameshot-org.github.io/blob/master/_coverpage.md)

1
src/CMakeLists.txt
View File

@@ -52,6 +52,7 @@ set(FLAMESHOT_TS_FILES
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_tr.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_uk.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_zh_CN.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_zh_HK.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_zh_TW.ts)
if(GENERATE_TS)