From 5289c156d3e3bcac5bb38c9ed352fe52202146d0 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sun, 31 Oct 2021 23:12:05 +0100
Subject: [PATCH] Revert support for Fedora 35

Fedora 35 builds encounter some internal error, thus revert support for
it.

This reverts commits:
- 4c4e9591244 ("Bump package version")
- c44b1e98f85 ("pkg: Add support for Fedora 35")
---
 .github/workflows/release.yml         | 57 +--------------------------
 PKGBUILD                              |  2 +-
 debian/changelog                      |  6 ---
 surface-ath10k-firmware-override.spec |  2 +-
 4 files changed, 4 insertions(+), 63 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a3d044a..f75232d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -69,35 +69,6 @@ jobs:
         name: debian-latest
         path: release
 
-  build-f35:
-    name: Build Fedora 35 package
-    runs-on: ubuntu-latest
-    container: fedora:35
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-
-    - name: Install build dependencies
-      run: $SCRIPTS/pkg-fedora.sh install
-
-    - name: Build package
-      run: $SCRIPTS/pkg-fedora.sh build
-
-    - name: Sign packages
-      env:
-        GPG_KEY_ID: 56C464BAAC421453
-        GPG_KEY: ${{ secrets.SURFACE_GPG_KEY }}
-      run: $SCRIPTS/pkg-fedora.sh sign
-
-    - name: Prepare release
-      run: $SCRIPTS/pkg-fedora.sh release
-
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v1
-      with:
-        name: fedora-35-latest
-        path: release
-
   build-f34:
     name: Build Fedora 34 package
     runs-on: ubuntu-latest
@@ -127,6 +98,7 @@ jobs:
         name: fedora-34-latest
         path: release
 
+
   build-f33:
     name: Build Fedora 33 package
     runs-on: ubuntu-latest
@@ -159,7 +131,7 @@ jobs:
   release:
     name: Publish release
     if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')
-    needs: [build-deb, build-arch, build-f35, build-f34, build-f33]
+    needs: [build-deb, build-arch, build-f34, build-f33]
     runs-on: ubuntu-latest
     steps:
     - name: Download Debian artifacts
@@ -172,11 +144,6 @@ jobs:
       with:
         name: arch-latest
 
-    - name: Download Fedora 35 artifacts
-      uses: actions/download-artifact@v1
-      with:
-        name: fedora-35-latest
-
     - name: Download Fedora 34 artifacts
       uses: actions/download-artifact@v1
       with:
@@ -236,26 +203,6 @@ jobs:
         GIT_REF: ${{ github.ref }}
       run: $SCRIPTS/repo-debian.sh $NAME
 
-  repo-f35:
-    name: Update Fedora 35 package repository
-    needs: [release]
-    runs-on: ubuntu-latest
-    container: fedora:35
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
-    - name: Download artifacts
-      uses: actions/download-artifact@v1
-      with:
-        name: fedora-35-latest
-
-    - name: Update repository
-      env:
-        SURFACEBOT_TOKEN: ${{ secrets.SURFACE_BOT_TOKEN }}
-        GIT_REF: ${{ github.ref }}
-      run: $SCRIPTS/repo-fedora.sh $NAME 35
-
   repo-f34:
     name: Update Fedora 34 package repository
     needs: [release]
diff --git a/PKGBUILD b/PKGBUILD
index 12df7bd..48c2ce9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Maximilian Luz <luzmaximilian@gmail.com>
 
 pkgname=surface-ath10k-firmware-override
-pkgver=20211031
+pkgver=20211020
 pkgrel=1
 arch=(any)
 pkgdesc="Firmware override for Surface devices with QCA6174 ATH10K WiFi Chip"
diff --git a/debian/changelog b/debian/changelog
index 8cac102..2161921 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-surface-ath10k-firmware-override (20211031-1) unstable; urgency=medium
-
-  * Bump package version
-
- -- Maximilian Luz <luzmaximilian@gmail.com>  Sun, 31 Oct 2021 22:44:33 +0100
-
 surface-ath10k-firmware-override (20211020-1) unstable; urgency=medium
 
   * Use proper board-2.bin file created by Hans de Goede
diff --git a/surface-ath10k-firmware-override.spec b/surface-ath10k-firmware-override.spec
index 90e0bfa..b9f57c4 100644
--- a/surface-ath10k-firmware-override.spec
+++ b/surface-ath10k-firmware-override.spec
@@ -2,7 +2,7 @@
 
 Name: surface-ath10k-firmware-override
 Summary: Firmware override for Surface devices with QCA6174 ATH10K WiFi chip
-Version: 20211031
+Version: 20211020
 Release: 1
 
 URL: https://github.com/linux-surface/ath10k-firmware-override