From 325f18511115b361de20fbd3b27decead2edea20 Mon Sep 17 00:00:00 2001
From: bootstrap-package-actions <info@manjaro-sway.download>
Date: Sat, 28 Aug 2021 21:11:12 +0000
Subject: [PATCH] chore(actions-bootstrap): update default actions

---
 .github/settings.yml           |  2 +-
 .github/workflows/pkgbuild.yml | 18 ++++++++----------
 .github/workflows/rebase.yml   |  4 ++--
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.github/settings.yml b/.github/settings.yml
index 13c1937..31a6686 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -1,5 +1,5 @@
 # inherits settings from https://github.com/Manjaro-Sway/.github/blob/main/.github/settings.yml
 _extends: .github
 repository:
-  homepage: "https://git.hya.sk/skia/swaysome.git"
+  homepage: https://git.hya.sk/skia/swaysome.git
 # you can extend settings using https://probot.github.io/apps/settings/
diff --git a/.github/workflows/pkgbuild.yml b/.github/workflows/pkgbuild.yml
index 4dc38ce..7f6c546 100644
--- a/.github/workflows/pkgbuild.yml
+++ b/.github/workflows/pkgbuild.yml
@@ -45,8 +45,7 @@ jobs:
       - uses: actions/checkout@v2.3.4
       - name: get-additional-gpg
         run: |
-          echo ${{ secrets.GPG_KEYID }} >>.github/additional_gpg
-          echo "ADDITIONAL_GPG=$(cat .github/additional_gpg)" >>$GITHUB_ENV
+          echo "ADDITIONAL_GPG=$(cat .github/additional_gpg | sed -e ':a;N;$!ba;s/\n/ /g')" >>$GITHUB_ENV
       - name: any-build
         if: ${{ ( contains(needs.prepare.outputs.architectures, 'any') && matrix.archlinux_arch == 'x86_64' ) }}
         run: echo "BUILD=true" >>$GITHUB_ENV
@@ -66,15 +65,14 @@ jobs:
           dockerRunArgs: |
             --volume "${PWD}/artifacts:/artifacts"
             --cap-add=SYS_ADMIN
-          shell: /bin/sh
+          shell: /bin/bash
           install: |
-            for key in "${{ env.ADDITIONAL_GPG }}";do
-              sudo -u builder gpg --keyserver keys.openpgp.org --recv-key $key
-            done
-            sudo -u builder gpg --keyserver keys.openpgp.org --recv-key ${{ secrets.GPG_KEYID }}
-            pacman-key --keyserver keys.openpgp.org --recv-keys ${{ secrets.GPG_KEYID }}
-
-            sed -i '/^\[core\]/i \[manjaro-sway\]\nSigLevel = Optional TrustAll\nServer = https://packages.manjaro-sway.download/$arch\n' /etc/pacman.conf
+            ADDITIONAL_GPG=$(echo ${{ env.ADDITIONAL_GPG }} | sed -e ':a;N;$!ba;s/\n/ /g')
+            if [[ -n "$ADDITIONAL_GPG" ]]; then
+              sudo -u builder gpg --keyserver keys.openpgp.org --recv-key $(echo ${ADDITIONAL_GPG})
+              pacman-key --keyserver keys.openpgp.org --recv-keys $(echo ${ADDITIONAL_GPG})
+            fi
+            sed -i '/^\[core\]/i \[manjaro-sway\]\nSigLevel = PackageRequired\nServer = https://packages.manjaro-sway.download/$arch\n' /etc/pacman.conf
             pacman-mirrors --geoip
           run: |
             pacman -Syy
diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
index 70091d9..000a20c 100644
--- a/.github/workflows/rebase.yml
+++ b/.github/workflows/rebase.yml
@@ -6,7 +6,7 @@ on:
     - cron:  '*/30 * * * *'
   
 env:
-  UPSTREAM_GIT: ""
+  UPSTREAM_GIT: https://git.hya.sk/skia/swaysome.git
 
 jobs:
   rebase:
@@ -35,4 +35,4 @@ jobs:
       if: ${{ failure() }}
       run: |
         git rebase upstream/$(git branch --show-current)
-        git push --force-with-lease
+        git push --force-with-lease
\ No newline at end of file