From 48e20581c7cbc7e2194e0d7eaed30cfb14207415 Mon Sep 17 00:00:00 2001
From: AxVultis <axvultis@protonmail.com>
Date: Wed, 31 Aug 2022 22:48:29 +0200
Subject: [PATCH 1/2] Add Ubuntu 22.04

---
 .github/workflows/check.yml    | 41 ++++++++++++++++++++++++
 .github/workflows/ubuntu22.yml | 57 ++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 .github/workflows/ubuntu22.yml

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index e4b839f4..d99c923d 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -248,6 +248,47 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+  build-ubuntu22:
+    name: Ubuntu 22.04
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update -y
+          sudo apt-get install -y qt5-default qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev
+
+      - name: Clone conceal-core
+        run: |
+          rm -rf cryptonote
+          git clone https://github.com/ConcealNetwork/conceal-core.git cryptonote
+          ./.github/checkout.sh
+
+      - name: Build
+        id: build
+        run: |
+          ccx_version=${GITHUB_SHA::7}
+          release_name=ccx-desktop-ubuntu-2204-dev-"$ccx_version"
+
+          lrelease src/languages/*.ts
+          make -j2 build-release
+          mkdir $release_name
+          mkdir -p $release_name/icon
+          mv build/release/conceal-desktop $release_name
+          cp conceal-desktop.desktop $release_name
+          cp src/images/conceal.png $release_name/icon
+
+          echo "::set-output name=release_name::${release_name}"
+
+      - name: Upload To GH Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ steps.build.outputs.release_name }}
+          path: ${{ steps.build.outputs.release_name }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
   build-macos:
     name: macOS
     runs-on: macos-11
diff --git a/.github/workflows/ubuntu22.yml b/.github/workflows/ubuntu22.yml
new file mode 100644
index 00000000..56d46550
--- /dev/null
+++ b/.github/workflows/ubuntu22.yml
@@ -0,0 +1,57 @@
+name: Ubuntu 22.04
+
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  build-ubuntu22:
+    name: Ubuntu 22.04
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: |
+          sudo apt update -y
+          sudo apt install -y qt5-default qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev
+
+      - name: Clone conceal-core
+        run: |
+          rm -rf cryptonote
+          git clone https://github.com/ConcealNetwork/conceal-core.git cryptonote
+
+      - name: Build
+        id: build
+        run: |
+          ccx_version=$(echo "$GITHUB_REF" | sed 's|refs/tags/||')
+          release_name=ccx-desktop-ubuntu-2204-v"$ccx_version"
+          build_folder="build/release"
+
+          lrelease src/languages/*.ts
+          make -j4 build-release
+          mkdir $release_name
+          mkdir -p $release_name/icon
+          mv $build_folder/conceal-desktop $release_name
+          cp conceal-desktop.desktop $release_name
+          cp src/images/conceal.png $release_name/icon
+          tar -czf "$release_name".tar.gz "$release_name"
+          sha256=$(shasum -a 256 "$release_name".tar.gz | awk '{print toupper($1)}')
+
+          echo "::set-output name=sha256::${sha256}"
+          echo "::set-output name=release_name::${release_name}.tar.gz"
+          echo "::set-output name=ccx_version::${ccx_version}"
+
+      # since https://github.com/softprops/action-gh-release/pull/145 body is replaced instead of being appended
+      # use v0.1.12 for now
+      - name: Create Release
+        uses: softprops/action-gh-release@v0.1.12
+        with:
+          files: ${{ steps.build.outputs.release_name }}
+          name: Conceal Desktop v${{ steps.build.outputs.ccx_version }}
+          body: |
+            [Download for Ubuntu 22.04](../../releases/download/${{ steps.build.outputs.ccx_version }}/${{ steps.build.outputs.release_name }}) **${{ steps.build.outputs.release_name }}**
+            `SHA256 : ${{ steps.build.outputs.sha256 }}`
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From a5ea93d9923cb38caa4c0f7b693918e8e52c2b7c Mon Sep 17 00:00:00 2001
From: AxVultis <axvultis@protonmail.com>
Date: Sat, 3 Sep 2022 16:31:14 +0200
Subject: [PATCH 2/2] Update Ubuntu 22.04

---
 .github/workflows/check.yml    | 2 +-
 .github/workflows/ubuntu22.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index d99c923d..8d73cf2c 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -257,7 +257,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y qt5-default qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev
+          sudo apt-get install -y qtbase5-dev qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev
 
       - name: Clone conceal-core
         run: |
diff --git a/.github/workflows/ubuntu22.yml b/.github/workflows/ubuntu22.yml
index 56d46550..58f611ec 100644
--- a/.github/workflows/ubuntu22.yml
+++ b/.github/workflows/ubuntu22.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt update -y
-          sudo apt install -y qt5-default qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev
+          sudo apt install -y qtbase5-dev qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev
 
       - name: Clone conceal-core
         run: |