Add support for Fedora 33

Signed-off-by: Dorian Stoll <[email protected]>

Author: StollD

.github/workflows/package.yml

@@ -102,6 +102,45 @@ jobs:
         name: arch-latest
         path: release
 
+  build-f34:
+    name: Build Fedora 34 package
+    runs-on: ubuntu-latest
+    container: fedora:34
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Install build dependencies
+      run: |
+        dnf distro-sync -y
+        dnf install -y rpmdevtools rpm-sign 'dnf-command(builddep)'
+        dnf builddep -y fedora/surface-secureboot.spec
+
+    - name: Build package
+      run: |
+        cd fedora
+
+        # Build the .rpm packages
+        ./makerpm
+
+    - name: Sign packages
+      env:
+        GPG_KEY: ${{ secrets.SURFACE_GPG_KEY }}
+      run: |
+        cd fedora/out/noarch
+
+        # import GPG key
+        echo "$GPG_KEY" | base64 -d | gpg --import --no-tty --batch --yes
+
+        # sign packages
+        rpm --resign *.rpm --define "_gpg_name $GPG_KEY_ID"
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v1
+      with:
+        name: fedora-34-latest
+        path: fedora/out/noarch
+
   build-f33:
     name: Build Fedora 33 package
     runs-on: ubuntu-latest
@@ -182,7 +221,7 @@ jobs:
 
   release:
     name: Publish release
-    needs: [build-deb, build-arch, build-f33, build-f32]
+    needs: [build-deb, build-arch, build-f34, build-f33, build-f32]
     runs-on: ubuntu-latest
     steps:
     - name: Download Debian artifacts
@@ -195,6 +234,11 @@ jobs:
       with:
         name: arch-latest
 
+    - name: Download Fedora 34 artifacts
+      uses: actions/download-artifact@v1
+      with:
+        name: fedora-34-latest
+
     - name: Download Fedora 33 artifacts
       uses: actions/download-artifact@v1
       with:
@@ -314,6 +358,56 @@ jobs:
         git commit -m "Update Arch Linux secure-boot MOK"
         git push --set-upstream origin "${update_branch}"
 
+  repo-f34:
+    name: Update Fedora 34 package repository
+    needs: [release]
+    runs-on: ubuntu-latest
+    container: fedora:34
+    steps:
+    - name: Install dependencies
+      run: |
+        dnf install -y git findutils
+
+    - name: Download artifacts
+      uses: actions/download-artifact@v1
+      with:
+        name: fedora-34-latest
+
+    - name: Update repository
+      env:
+        SURFACEBOT_TOKEN: ${{ secrets.GITHUB_BOT_TOKEN }}
+        BRANCH_STAGING: u/staging
+        GIT_REF: ${{ github.ref }}
+      run: |
+        repo="https://surfacebot:${SURFACEBOT_TOKEN}@github.com/linux-surface/repo.git"
+
+        # clone package repository
+        git clone -b "${BRANCH_STAGING}" "${repo}" repo
+
+        # copy packages
+        cp fedora-34-latest/* repo/fedora/f34
+        cd repo/fedora/f34
+
+        # 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 "secureboot-mok:$GIT_TAG/$(basename $pkg)" > $pkg.blob
+          rm $pkg
+        done
+
+        # set git identity
+        git config --global user.email "[email protected]"
+        git config --global user.name "surfacebot"
+
+        # commit and push
+        update_branch="${BRANCH_STAGING}-$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
+        git checkout -b "${update_branch}"
+        git add .
+        git commit -m "Update Fedora 34 secure-boot MOK"
+        git push --set-upstream origin "${update_branch}"
+
   repo-f33:
     name: Update Fedora 33 package repository
     needs: [release]
@@ -413,4 +507,3 @@ jobs:
         git add .
         git commit -m "Update Fedora 32 secure-boot MOK"
         git push --set-upstream origin "${update_branch}"
-