From 38f2ce41096c8331e20ec309a800a03a4f15b268 Mon Sep 17 00:00:00 2001
From: Alexandru Nedelcu <noreply@alexn.org>
Date: Sat, 7 May 2022 10:56:59 +0300
Subject: [PATCH] Change PGP key

---
 .github/env/pgp-secret               |  1 +
 .github/scripts/setup-pgp            | 17 +++++------------
 .github/workflows/backport.yml       | 16 ----------------
 .github/workflows/build.yml          |  2 --
 .github/workflows/manual-publish.yml |  2 --
 5 files changed, 6 insertions(+), 32 deletions(-)
 create mode 100644 .github/env/pgp-secret
 delete mode 100644 .github/workflows/backport.yml

diff --git a/.github/env/pgp-secret b/.github/env/pgp-secret
new file mode 100644
index 000000000..e82dfe1d0
--- /dev/null
+++ b/.github/env/pgp-secret
@@ -0,0 +1 @@
+LS0tLS1CRUdJTiBQR1AgUFJJVkFURSBLRVkgQkxPQ0stLS0tLQoKbFFXR0JHSjJJVXdCREFETHJKU0VvUlMxRmJoQ09FNkRvNDh4OEZhSDhwTzNadmdpdDJiUXRYQy9ueEI3eTNrMApzdVF0bUZ4eHRkQTRFQjFSa2piQ3RqWkw1c0EvM3V6UzFKUmdjQzE1TExwUUNXeDA5UklEc0NFbjBvWnEweVllCllGWXVCNmpHcWFQcFJrV2hVZG95N0VWZjUzZDZ1Y2duTEhtREp5STFFVnQ5WmhLZmhKSFR0a2JKcWpVOVdFcXMKV3BxMzJVZm1FdlVSbEp6N2R6QTl0UHhycGVpQUc2QmF5b3NpSmZENVFOVGpJRFNueXFOUEhsN1NycmF0TEFSdwo1MWF1QXJleW9Td0ZRamZHRTBYczYxVjI4TkpOQmJOMmQ0M0c0Y1BHalJ4cDY0MGpHRzZXalJlQVRaUUg1SHJhCkxXeHhhcVNWRUV6OUtzMW9LYjhLRks5NXpJV0QxTmtsdHRjSFpOT2VmWG1McjVaeHJBclRlU2NwcXBKaUZxZWYKbHhyRjNVVUZuSm1FZjc5OFA4OWpyRFRYQjBMVXNZMGwzVEtndExIKy9yQTFibHRqbFFTQ1hyODZ2QVVWTVkyZAo4Um9tbmhjUng0QnBPcXpQcUhQZlFuZW82anlOUGNkMys1VnBXbmJXNTVIYjZ0SWM0NmJGMUI4b09HMy9ISVVyClRzbC93RENldk9RNGNBRUFFUUVBQWY0SEF3TEZqQ0JDT0NKUTN1c3hiSGhQQUhIWEhRUnFVNUR1aEdRUEtGSHYKQnhoK1h6ZXo2R3pJV3BzeG1oYURwcUpSSmplSGwrWlBpeXA5VkRvOGVMVkhIZGFEQ1RRQ0t5OHp1L3FtMXpTVApQS3d0dWVReVR5L2g1Q2Evei96YTVjVXVxdjZYYXZqT2puY1ZSdi9LQkUzVk92bWg4Um83KythQ3dVSjF1OWNxCkpLZ3BsWmd2cC9iNWYrUzEraVB6d284amdlYURTa2dRK2l3NEN1YzFDZHhwZ2N5anZneHVkaW94aURQZFhyb1MKOFVhWGxERi9OazkxNFhXZGg0OW5CRXdzV28zRUs4UUxGTFJxaHZOdVowK2VjVFd6N1A5Rk4rYnZKSXNxdjFTbApmenFNd2U2cDRsanc3eWZqRWFUWFFDdnhkS2xKdnBMWEVpZWdzSmdqc3lld1NTMnYxa1Y1N0ZLTGF2MTBqNEtqClFuYjlaakN5ZVB5VXdZeTg0ZTYybjhyVGdnTDY4czNScmlBWk1BUU4zMWZKWWRWODc5SWdabVllRWNtUThTUkYKRGtpUmZ0ZUFRRk5XVWtVOUdITXQweXFHbzNhSnF4ajVZSHl2MDFJTWh6MHM0eFZjTStxSWdiRHZ1MlE4blVmZQo1d1NSa0pwTnNVbVAyY3BZTXJTdnQ3VTIvK0dOUTVSZTV6cGdJbFBWRWdiUzFqTjlvR1BnOGhMUk1jamxBKzV1CmZCcjlDZktYVFZzSFQrSDF3SXRWWmtJU0hldlQ5Vlo1QlRQQVlIVEFkS284T2RvdGU4OW8zMURTZ3lITWNJZ2QKTFY0a0Y1UC94aUQ5SXIyR1RNTWFTd3lOR3g1bUZzUEpYWGw5WTRnZmY1UWdCa00vb2IvU1Z6MTFKNjJaV29xagpVWWl2RDFYakdnYjEyYy9SSW9DeElFcGJiYXBjOVcxK20xVXBJWnArNXVObDNNeVVpSFlna1FFR1phQUN5bTd3Cmxxdi9hTGRReEdFd1pCUmlXSnoyKzVMMlU4dENERWRLRzR2VXhvSHNnS2s2dFNmTW9PU2cxa1pVaWgvQ3Jwd0IKclAvVURWMmhLOE4vaDVBQ1RCeVJMdldFQlZoMnBJSHc5MFlpRzZQK0VOUjN4ZzZtWWNWZHUyaVgvazhFT2hDdQpWOU5JWDNrKzQxakxHeHdUcS9XRE1lYXAreFArNkZZTmJIYU13a29mL2ZPZE9WQktTS3lDUW04NEhlRS9JWkRwCmVFSnZYVXJiTyt1dUhFVmFjRnpWK2xDRkovYWd3ZFVCd2U1R1lQRkY4bzlVV2hTZ0tFc2JqKzdvSFZCYkJCMFMKeDgxZGZqVmYxa2ZkQ3IwY3E5cDdOTmZBRXlSTzBMWiszUkdFRGNsbVhqSUdnWlZVRTJ2MzkwMjlURGZSZi9lZgo1WERsalpjZENGNEJkcGtxUDArVlBvZHN4R2ozTmRNMEVTNmtPOUhKYnJEcVFhblJWYnBRbTZHbURQbHdMZml2CjdXM0U5NjJKN3R5cVdrdjVXMHBQR3Q5TkFIYWl3RmU4bDFmTlplcGxBaEx4akVjRmpCRVZlSlE4SCtKR1hBMncKVWs2Q0NIT1hkY3F5ZW1DV3RZSm9nRDQ5V0o1SVdhY2N6aVRQSnZycEtjYW1ud0pjd1FWdjNnV0NudnRVSjVFcwp0ZkhJWjNvNHhERWg4d25BcitaMVdlZ3JCd2NhaGU4dUh2ZXZjbWVucGxaclJXUUMvbDNtWmFVWTFJb2lvcE1jCnRQZEFKVU5mTkpHRDB6aXhBSUNDdVkzSUxHaXZRaUdZbnJRa1RXOXVhWGdnVFdGcGJuUmhhVzVsY25NZ1BHTnYKYm5SaFkzUkFiVzl1YVhndWFXOCtpUUhVQkJNQkNBQStGaUVFS0RmNlhFdW1hU3EzSDJBSjgzWnU5VDV3RmJrRgpBbUoySVV3Q0d3TUZDUVBDWndBRkN3a0lCd0lHRlFvSkNBc0NCQllDQXdFQ0hnRUNGNEFBQ2drUTgzWnU5VDV3CkZibkp6UXdBclczditRT0Zqai96NE5zcWtpNkhHNWR3TVF1OEp2WUlQVVg1bHk5SWx3elM3STFyb29sRU96MmYKZzlSSXUrSnBrYWJjUmhSNUdiZGNhMzExRGFyVVdIdW9pQm40SkV6ZkxuNG4vVDhmZk9yTDRQbmJ6UndvcTdFUgpmOVF2UWxtcXN6N0xFZ2Z5UURYbGNvcVk1RndUOEExd0tTcnliRE1MUHVXRmd0eCszb2hacWIxejdJTXgrUnc0Cnh4NGdVNmJsb09YbDJ3TDNGSGtJdVJLT21nRWNUVjJzYkNtYjFzNTZzODBLcjV0R29LcCsxbml4Qkl5YlhjN0EKWVBpc0hCZGxXWE93cTdzS0pacG1XQkNMRHl3L2xCV0pVSjFCZUhHQ0hlMDU0a0xKWWNmTEdaUWNtLzBYR3VMTgo4bjB0UFRyeXJIOUpWNFdPNHlkRUxtMUQzZTZUQlovSGhOcHZ6OWdUNHp1NmNldXU5ajJsNmlMSGFybmo2ZC9vCm5ZZmZqZmhOdy9OcjhPZDFIK1RWZEdWREhQVHZITFpkazk3RHp0dk9jYUtlVHNLN3k2Z3owQlhBcXpDcGRVMEYKMmsyR3pERmd3M1hHc0lWeDZTTWRnQWpYUUxpY0RBTmM0SDgzTGxLQngydHl1OEhNMTNheXBRQ1NVWCtUSnM5cwpoczlwRDdMc25RV0dCR0oySVV3QkRBREtpWmZuVjVKMndWRDJyWnkyS3lOTXZmU1E2Y2FNdFV2aDkxRkRhRlMwCmdKVGUrT2VOMXFpcWIrcHdGK0dFQlRlL0tGVFhrUTJKd3FzK0xHZUx4VzllSFRZaVAzUDJyV1czSnRidTluK0gKVWkrYnZWMnFBVC9WMXRxVjcvbURlbFpxRE0rMGJqMUxiZlE5MGdqVDRPVVdxRm1SYlpTb0xMbm05YVowbm91QQpkeE1RUkZLd0pJYXRCVUZRai9SMkY5SUZWVnlhY2UrclVqZmREOUJac1B4dUFQcnRCb21MSVRXTTRiQVNDT0ZICmN2RE9YdEd4d1grU3JxV0NjUnRTblc1dGZjbVRqU3lDTlNtdERjelU2MjNVSUFtMloyaTRJcTdnb3ZFZHBCUmUKeExrb0RHZFBQWGJGWDNUbktjbmhzcnJEdFJXMU02YklZMmw5Z1JpMjBBMk8weko2MmN1clNhRUIzLytDZzFLTApyMjBnVDNPd0E3VzhBMW9ZZHpEdjROZXRHME85cFVQNEpRQ09aVWtVZDVvS3FkOVdWM3IvTXZpbEUxdmVGTUdzCk84RG5uUDlXN2liOGpzR0lmclJXRklyck1TaE1tNEhkRmMyN0EzVWMwbW94WmFTOEdJZVVvMysyRTBLZ2UxZnYKYXVvaElUTTk5cWpHb1lBaUZUNDBqVjhBRVFFQUFmNEhBd0xtdGJMdmpacitST3NLcExtQ3R2K05OQjRlK3NvSQprVm1IYzNQeEtHYnpNVXdmNjJJU0Z5cEwxQ0tqaFlWZ3orbjJ0bHltVU5EWW9lckxsSytzQ0lpT0l6SnJsMnlWClhNeHRTd2RldnhRMXUybnV6WXZTVFBZTU5ocm8zVEhTRTY5K1FlTXZEd3RqbjRKcFpNZUd4dEVMUFY2UHZJVS8KNk14WWp2NHFib0JTekZ1ZllURm0vWFpHRjRsME5MM3VIREQrczh3LzNIZjNpYmJjOGpHZnRva3p5L0VLcmhwKwp4cEROUjlRWCtoTmQ3NVUrVEUzbW0yelRoSklFUVFPbG1obzJKaDdGdWlySWc5Q3dNM2x1Z0tSMmxUQXZIQjkrClkvNFQyNS9RdHBJTWszZTYzdGdJaXltcjlURGFLcWxEK0xMYjFWdkxGVTlJWko0cXpialVJNk44NlczSm14ZXgKMUt5d1ZBeWtYOVd2YzFDNjBybXk0anVUY0FJRmZNN0FZeHlpbG9rWENsSVQ3dDJzM0d3VVdmcEU1SmFGUnUyeApYRTZob25QdU9nRzNaYkhHcTg5R0hRd2Y4WWZWNHlCQ0NZOWo2ejFKdU9iVjhneWpTVHNvdTVMY3F1N1cwVmxjCno0empPWnEybmFRUTd1WE9iRXBMRUpuT3luY2RWcEVMVTRzcVVpQitsU3NGdFE4SEYrb0crWi9EZHViNndpR2sKSWJRakc4SkdtbVg3OHpvcXRxM05kZjVsNkZVNGhVbmNXOVhBdGNOWmtuaXJVdlI0VGZWN0wyZG5JeVdzbS8yQQpaTmNKZTVkeGhXSDFwekx6MlJ5QXY0QW9VOS80ZmJVN2hMTE1XOVUzNUhsNmkyd2hyVER5b2JkUExoVDdlNXIrCmkyU0tOTHcvcHBISjVRMnJQVDB5OXdkcnhiUiszM090dTlodDY1REFoWXdZOStPWGJlbzdUajdPMnZISHBrNDgKNHBhL3ZaNzh0dXdRUjVXdGpldU1OTkpIalF4Vk1vUklOaTh0TzZaTjRPU1NIUzJFWUZ5Q0JTdVM2VW1QR1NZMgplVkdPSlgzL1g2U092Sk1VU0lqNjRCdzd1bmE1UUtGWXZuWTVnaHVPQitFUk5NNXFLYUk0clQrY1ZQbWtzblF1ClAwZ25qc1RGdnBRdk43OGsxQ3NuNmYzZHhEaGdhVlZCbkVvenUrSVFqWFlBQXZJQzZTOEN4WFg2dkdac21CTC8KdDFNVk1SdTB2dmcva1d3OG1STm8yNzUxZEtMYUlDSmxGdWY0SkVNN1g3eVhUU3JRUGtWbWFRcmR3UEgzSkdNaAowZDRpRzduQUFpU0VJOFJpRVlhVENDK2MvKzJJZ2RITmpHQWxJaGZ2U1MyVGwvOTRVb3h1bzYyUnhZanJCQnpDClNidTJjY1lyZmRZZTNac1pxb25rY3FXeVNuVW42Ky9vQXlybE80YW0zYzFacXRHdGxaMnRtbEowd3ZOU05kL3UKeE1jQ1g3S3JHU3l2Y3g3SGtVOWpqd3JpQU5zOTlZME4zWFJKcktRS1lNWTFPa01YYmViWm9obDVHRW9FOGFybwpGWXhCMEg5OG9OTUJQWmdvRXpXT3pCSXNUNnlPL1B4cEV2WHVUS0JTdGc2N3FjT3oxTU1kai9TTk00dEk1czY0Cmc5VSsrNnFkcEl1dDJ5RTd6dE9CT1N3Sm5Va1U5eDhLZEgvUkNPRGdxU3E2RURjNWJObENyaVFTazVyYlcrZTUKMDE2dlNqVUZpQlVtMUF5R1JISkF1SzlQSTVKVDlwOHR1V2l6cm5TbWJZa0J2QVFZQVFnQUpoWWhCQ2czK2x4TApwbWtxdHg5Z0NmTjJidlUrY0JXNUJRSmlkaUZNQWhzTUJRa0R3bWNBQUFvSkVQTjJidlUrY0JXNWNTQUwvMUtmCk93UnExaUl4SEhHUmRzV3JoaUUwSVJKbndoZi9INlY4YkN3a20rekJIcmM5QXVqNXF0aHF4U1M0cSt2YVUrdlUKZVZQMnpBenRoeXJPaFpEZVpERm56aFQ0UEhLMkhmOUR3WXdkcDl5SXZvd1BzYlV4K1UwZEwyb0lwMEI1VG1GQgoxWGdQY3U4blBGd25hZW9FVmxTUW9OVi9aa3hhU1RHYUhrSVZDcmk5OFJLYmh1ZG5XdndpU1dLbWpseElNczYvCllxN1J3UHFJL3VFY0hZN3lYcnY0N1pJLzVQTUJJMUlYTHNoSmtCenR4WHVPU29vQUZTUUt2bHN5TnhEZzFGNmMKL2RiZXFsSGxueVppNzBDWVkrcWEzWE9wTm81UkM2TFpnZ1FRK3RxcTN4NEg4alVka2JpektsendmMzE5TXFTeApETk13a2MzbjV5bmwzL0FtN2ZEd041RklxYjQ1SzRzOVorYjhGcWYrZWR0K0FHQXFMeVQ0NThJUGc0VXRubnQwCmF4RklQaDVDQzZ4SkpvMnorVkplM0RIcEk1KzgxcmNKWGpZci9FOHgyYUtOMkNZL3cweGNncGFmbE1MN0wzeTgKVTM4TGNZemFscjhNT2NzQ2plbnRHU2RnaDMxbzNPNnlxRm1DcmM2QnRGeU5QVnk4ZVFXeGpKbEMzQzhaZFE9PQo9NmswRgotLS0tLUVORCBQR1AgUFJJVkFURSBLRVkgQkxPQ0stLS0tLQo=
diff --git a/.github/scripts/setup-pgp b/.github/scripts/setup-pgp
index 5119ba3fd..1fdf04d64 100755
--- a/.github/scripts/setup-pgp
+++ b/.github/scripts/setup-pgp
@@ -1,23 +1,16 @@
 #!/usr/bin/env bash
 
-if [ -z "$PGP_SECRET" ]; then
-    echo "ERROR: PGP_SECRET is not set!" >&2
-    exit 1
+cd "$(dirname $0)/../../" || exit 1
+if ! [ -f "./.github/env/pgp-secret" ]; then
+    echo "ERROR: malformed project directory!" >&2
+    exit 2
 fi
 
 sudo apt-get update && sudo apt-get -y install gnupg2
-
-echo "Creating directory ~/.gnupg"
 mkdir ~/.gnupg && chmod 700 ~/.gnupg
-
-echo "Updating ~/.gnupg/gpg.conf"
 echo use-agent >> ~/.gnupg/gpg.conf
 echo pinentry-mode loopback >> ~/.gnupg/gpg.conf
 echo allow-loopback-pinentry >> ~/.gnupg/gpg-agent.conf
 chmod 600 ~/.gnupg/*
-
-echo "Reloading agent (via gpg-connect-agent)"
 echo RELOADAGENT | gpg-connect-agent
-
-echo "Importing PGP_SECRET"
-echo $PGP_SECRET | base64 --decode | gpg --import --no-tty --batch --yes
+cat "./.github/env/pgp-secret" | base64 --decode | gpg --import --no-tty --batch --yes
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
deleted file mode 100644
index 26801ebbe..000000000
--- a/.github/workflows/backport.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Backport
-on:
-  pull_request:
-    types:
-      - closed
-      - labeled
-
-jobs:
-  backport:
-    runs-on: ubuntu-18.04
-    name: Backport
-    steps:
-      - name: Backport
-        uses: tibdex/backport@v1
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ef0099df0..c617ec3fa 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -221,8 +221,6 @@ jobs:
       - name: Install GnuPG2
         run: |
           ./.github/scripts/setup-pgp
-        env:
-          PGP_SECRET: ${{ secrets.PGP_SECRET }}
 
       - name: .github/scripts/release
         run: |
diff --git a/.github/workflows/manual-publish.yml b/.github/workflows/manual-publish.yml
index 0a8510eea..ffb83e1dc 100644
--- a/.github/workflows/manual-publish.yml
+++ b/.github/workflows/manual-publish.yml
@@ -30,8 +30,6 @@ jobs:
       - name: Install GnuPG2
         run: |
           ./.github/scripts/setup-pgp
-        env:
-          PGP_SECRET: ${{ secrets.PGP_SECRET }}
 
       - name: sbt ci-release
         run: |