Skip to content
This repository has been archived by the owner on Jun 3, 2023. It is now read-only.

Commit

Permalink
Revert support for Fedora 35
Browse files Browse the repository at this point in the history
Fedora 35 builds encounter some internal error, thus revert support for
it.

This reverts commits:
- 4c4e959 ("Bump package version")
- c44b1e9 ("pkg: Add support for Fedora 35")
  • Loading branch information
qzed committed Oct 31, 2021
1 parent 4c4e959 commit 5289c15
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 63 deletions.
57 changes: 2 additions & 55 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -127,6 +98,7 @@ jobs:
name: fedora-34-latest
path: release


build-f33:
name: Build Fedora 33 package
runs-on: ubuntu-latest
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Maintainer: Maximilian Luz <[email protected]>

pkgname=surface-ath10k-firmware-override
pkgver=20211031
pkgver=20211020
pkgrel=1
arch=(any)
pkgdesc="Firmware override for Surface devices with QCA6174 ATH10K WiFi Chip"
Expand Down
6 changes: 0 additions & 6 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
surface-ath10k-firmware-override (20211031-1) unstable; urgency=medium

* Bump package version

-- Maximilian Luz <[email protected]> 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
Expand Down
2 changes: 1 addition & 1 deletion surface-ath10k-firmware-override.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5289c15

Please sign in to comment.