Pārlūkot izejas kodu

Always restore the full repository for createrepo

Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
Dorian Stoll 5 gadi atpakaļ
vecāks
revīzija
e269cf3f37
2 mainītis faili ar 26 papildinājumiem un 14 dzēšanām
  1. 13 7
      .github/workflows/fedora-30.yml
  2. 13 7
      .github/workflows/fedora-31.yml

+ 13 - 7
.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:

+ 13 - 7
.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: