From e269cf3f3751d25fc64666f2e2ef31ec976e65b8 Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@tmsp.io>
Date: Fri, 24 Jan 2020 00:22:32 +0100
Subject: [PATCH] Always restore the full repository for createrepo

Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
---
 .github/workflows/fedora-30.yml | 20 +++++++++++++-------
 .github/workflows/fedora-31.yml | 20 +++++++++++++-------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/fedora-30.yml b/.github/workflows/fedora-30.yml
index 18ee13152..e078990da 100644
--- a/.github/workflows/fedora-30.yml
+++ b/.github/workflows/fedora-30.yml
@@ -66,7 +66,7 @@ jobs:
     steps:
     - name: Install dependencies
       run: |
-        dnf install -y createrepo_c git findutils
+        dnf install -y createrepo_c git findutils wget
 
     - name: Checkout repository
       uses: actions/checkout@v2
@@ -76,6 +76,14 @@ jobs:
         fetch-depth: 0
         ref: master
 
+    - name: Unpack repository
+      run: |
+        cd fedora/f30
+
+        for blob in $(find . -name '*.blob'); do
+          wget https://github.com/linux-surface/linux-surface/releases/download/$(cat $blob)
+        done
+
     - name: Download artifacts
       uses: actions/download-artifact@v1
       with:
@@ -86,6 +94,10 @@ jobs:
         GPG_KEY: ${{ secrets.SURFACE_GPG_KEY }}
         GIT_REF: ${{ github.ref }}
       run: |
+        for pkg in $(find fedora-30-latest -name '*.rpm'); do
+          echo "$GIT_TAG/$(basename $pkg)" > $pkg.blob
+        done
+
         cp fedora-30-latest/* fedora/f30/
         rm -r fedora-30-latest
 
@@ -102,12 +114,6 @@ jobs:
         # Parse git tag from ref
         GIT_TAG=$(echo $GIT_REF | sed 's|^refs/tags/||g')
 
-        # Convert packages into references
-        for pkg in $(find . -name '*.rpm'); do
-          echo "$GIT_TAG/$(basename $pkg)" > $pkg.blob
-          rm $pkg
-        done
-
     - name: Commit and push
       uses: github-actions-x/commit@v2.3
       with:
diff --git a/.github/workflows/fedora-31.yml b/.github/workflows/fedora-31.yml
index 9c7b479d3..e90a2d09e 100644
--- a/.github/workflows/fedora-31.yml
+++ b/.github/workflows/fedora-31.yml
@@ -66,7 +66,7 @@ jobs:
     steps:
     - name: Install dependencies
       run: |
-        dnf install -y createrepo_c git findutils
+        dnf install -y createrepo_c git findutils wget
 
     - name: Checkout repository
       uses: actions/checkout@v2
@@ -76,6 +76,14 @@ jobs:
         fetch-depth: 0
         ref: master
 
+    - name: Unpack repository
+      run: |
+        cd fedora/f31
+
+        for blob in $(find . -name '*.blob'); do
+          wget https://github.com/linux-surface/linux-surface/releases/download/$(cat $blob)
+        done
+
     - name: Download artifacts
       uses: actions/download-artifact@v1
       with:
@@ -86,6 +94,10 @@ jobs:
         GPG_KEY: ${{ secrets.SURFACE_GPG_KEY }}
         GIT_REF: ${{ github.ref }}
       run: |
+        for pkg in $(find fedora-31-latest -name '*.rpm'); do
+          echo "$GIT_TAG/$(basename $pkg)" > $pkg.blob
+        done
+
         cp fedora-31-latest/* fedora/f31/
         rm -r fedora-31-latest
 
@@ -102,12 +114,6 @@ jobs:
         # Parse git tag from ref
         GIT_TAG=$(echo $GIT_REF | sed 's|^refs/tags/||g')
 
-        # Convert packages into references
-        for pkg in $(find . -name '*.rpm'); do
-          echo "$GIT_TAG/$(basename $pkg)" > $pkg.blob
-          rm $pkg
-        done
-
     - name: Commit and push
       uses: github-actions-x/commit@v2.3
       with: