Fedora 31 is EOL

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

Author: StollD

.github/workflows/package.yml

@@ -180,48 +180,9 @@ jobs:
         name: fedora-32-latest
         path: fedora/out/noarch
 
-  build-f31:
-    name: Build Fedora 31 package
-    runs-on: ubuntu-latest
-    container: fedora:31
-    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-31-latest
-        path: fedora/out/noarch
-
   release:
     name: Publish release
-    needs: [build-deb, build-arch, build-f33, build-f32, build-f31]
+    needs: [build-deb, build-arch, build-f33, build-f32]
     runs-on: ubuntu-latest
     steps:
     - name: Download Debian artifacts
@@ -244,11 +205,6 @@ jobs:
       with:
         name: fedora-32-latest
 
-    - name: Download Fedora 31 artifacts
-      uses: actions/download-artifact@v1
-      with:
-        name: fedora-31-latest
-
     - name: Upload assets
       uses: svenstaro/upload-release-action@v1-release
       with:
@@ -458,52 +414,3 @@ jobs:
         git commit -m "Update Fedora 32 secure-boot MOK"
         git push --set-upstream origin "${update_branch}"
 
-  repo-f31:
-    name: Update Fedora 31 package repository
-    needs: [release]
-    runs-on: ubuntu-latest
-    container: fedora:31
-    steps:
-    - name: Install dependencies
-      run: |
-        dnf install -y git findutils
-
-    - name: Download artifacts
-      uses: actions/download-artifact@v1
-      with:
-        name: fedora-31-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-31-latest/* repo/fedora/f31
-        cd repo/fedora/f31
-
-        # 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 31 secure-boot MOK"
-        git push --set-upstream origin "${update_branch}"