From 2f133cab32b1fe073893dd04b2491b96bba8f834 Mon Sep 17 00:00:00 2001
From: Ahmed Zetao Yang <zetao.yang@hotmail.com>
Date: Thu, 15 Oct 2020 21:02:27 +0800
Subject: [PATCH] chore(CI): using environment files to manage environment
 (#1073)

* chore(CI): using environment files to manage environment

* using Environment Files, due to the `set-env` command is deprecated and will be disabled soon
* https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
* https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#environment-files

* docs: add flathub store badge
---
 .github/workflows/Linux-pack.yml   | 15 +++++++--------
 .github/workflows/Windows-pack.yml |  2 +-
 README.md                          |  7 +++++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/Linux-pack.yml b/.github/workflows/Linux-pack.yml
index eb367711..89a62655 100644
--- a/.github/workflows/Linux-pack.yml
+++ b/.github/workflows/Linux-pack.yml
@@ -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
diff --git a/.github/workflows/Windows-pack.yml b/.github/workflows/Windows-pack.yml
index 6ca6952a..40404624 100644
--- a/.github/workflows/Windows-pack.yml
+++ b/.github/workflows/Windows-pack.yml
@@ -75,7 +75,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: Cache Qt
         id: cache-qt
diff --git a/README.md b/README.md
index 9451ab32..81deb5c8 100644
--- a/README.md
+++ b/README.md
@@ -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>