pkg: Add support for Fedora 36 and drop Fedora 33

Author: StollD

.github/workflows/package.yml

@@ -102,11 +102,11 @@ jobs:
         name: arch-latest
         path: release
 
-  build-f35:
-    name: Build Fedora 35 package
+  build-f36:
+    name: Build Fedora 36 package
     runs-on: ubuntu-latest
     container:
-      image: fedora:35
+      image: fedora:36
       options: --security-opt seccomp=unconfined
     steps:
     - name: Checkout code
@@ -140,13 +140,15 @@ jobs:
     - name: Upload artifacts
       uses: actions/upload-artifact@v1
       with:
-        name: fedora-35-latest
+        name: fedora-36-latest
         path: fedora/out/noarch
 
-  build-f34:
-    name: Build Fedora 34 package
+  build-f35:
+    name: Build Fedora 35 package
     runs-on: ubuntu-latest
-    container: fedora:34
+    container:
+      image: fedora:35
+      options: --security-opt seccomp=unconfined
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
@@ -179,13 +181,13 @@ jobs:
     - name: Upload artifacts
       uses: actions/upload-artifact@v1
       with:
-        name: fedora-34-latest
+        name: fedora-35-latest
         path: fedora/out/noarch
 
-  build-f33:
-    name: Build Fedora 33 package
+  build-f34:
+    name: Build Fedora 34 package
     runs-on: ubuntu-latest
-    container: fedora:33
+    container: fedora:34
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
@@ -218,12 +220,12 @@ jobs:
     - name: Upload artifacts
       uses: actions/upload-artifact@v1
       with:
-        name: fedora-33-latest
+        name: fedora-34-latest
         path: fedora/out/noarch
 
   release:
     name: Publish release
-    needs: [build-deb, build-arch, build-f35, build-f34, build-f33]
+    needs: [build-deb, build-arch, build-f36, build-f35, build-f34]
     runs-on: ubuntu-latest
     steps:
     - name: Download Debian artifacts
@@ -236,6 +238,11 @@ jobs:
       with:
         name: arch-latest
 
+    - name: Download Fedora 36 artifacts
+      uses: actions/download-artifact@v1
+      with:
+        name: fedora-36-latest
+
     - name: Download Fedora 35 artifacts
       uses: actions/download-artifact@v1
       with:
@@ -360,12 +367,12 @@ jobs:
         git commit -m "Update Arch Linux secure-boot MOK"
         git push --set-upstream origin "${update_branch}"
 
-  repo-f35:
-    name: Update Fedora 35 package repository
+  repo-f36:
+    name: Update Fedora 36 package repository
     needs: [release]
     runs-on: ubuntu-latest
     container:
-      image: fedora:35
+      image: fedora:36
       options: --security-opt seccomp=unconfined
     steps:
     - name: Install dependencies
@@ -375,7 +382,7 @@ jobs:
     - name: Download artifacts
       uses: actions/download-artifact@v1
       with:
-        name: fedora-35-latest
+        name: fedora-36-latest
 
     - name: Update repository
       env:
@@ -389,8 +396,8 @@ jobs:
         git clone -b "${BRANCH_STAGING}" "${repo}" repo
 
         # copy packages
-        cp fedora-35-latest/* repo/fedora/f35
-        cd repo/fedora/f35
+        cp fedora-36-latest/* repo/fedora/f36
+        cd repo/fedora/f36
 
         # parse git tag from ref
         GIT_TAG=$(echo $GIT_REF | sed 's|^refs/tags/||g')
@@ -409,14 +416,16 @@ jobs:
         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 35 secure-boot MOK"
+        git commit -m "Update Fedora 36 secure-boot MOK"
         git push --set-upstream origin "${update_branch}"
 
-  repo-f34:
-    name: Update Fedora 34 package repository
+  repo-f35:
+    name: Update Fedora 35 package repository
     needs: [release]
     runs-on: ubuntu-latest
-    container: fedora:34
+    container:
+      image: fedora:35
+      options: --security-opt seccomp=unconfined
     steps:
     - name: Install dependencies
       run: |
@@ -425,7 +434,7 @@ jobs:
     - name: Download artifacts
       uses: actions/download-artifact@v1
       with:
-        name: fedora-34-latest
+        name: fedora-35-latest
 
     - name: Update repository
       env:
@@ -439,8 +448,8 @@ jobs:
         git clone -b "${BRANCH_STAGING}" "${repo}" repo
 
         # copy packages
-        cp fedora-34-latest/* repo/fedora/f34
-        cd repo/fedora/f34
+        cp fedora-35-latest/* repo/fedora/f35
+        cd repo/fedora/f35
 
         # parse git tag from ref
         GIT_TAG=$(echo $GIT_REF | sed 's|^refs/tags/||g')
@@ -459,14 +468,14 @@ jobs:
         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 commit -m "Update Fedora 35 secure-boot MOK"
         git push --set-upstream origin "${update_branch}"
 
-  repo-f33:
-    name: Update Fedora 33 package repository
+  repo-f34:
+    name: Update Fedora 34 package repository
     needs: [release]
     runs-on: ubuntu-latest
-    container: fedora:33
+    container: fedora:34
     steps:
     - name: Install dependencies
       run: |
@@ -475,7 +484,7 @@ jobs:
     - name: Download artifacts
       uses: actions/download-artifact@v1
       with:
-        name: fedora-33-latest
+        name: fedora-34-latest
 
     - name: Update repository
       env:
@@ -489,8 +498,8 @@ jobs:
         git clone -b "${BRANCH_STAGING}" "${repo}" repo
 
         # copy packages
-        cp fedora-33-latest/* repo/fedora/f33
-        cd repo/fedora/f33
+        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')
@@ -509,5 +518,5 @@ jobs:
         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 33 secure-boot MOK"
+        git commit -m "Update Fedora 34 secure-boot MOK"
         git push --set-upstream origin "${update_branch}"