Pārlūkot izejas kodu

Remove support for Fedora 33

Fedora 33 has reached its end of life.
Maximilian Luz 3 gadi atpakaļ
vecāks
revīzija
f841fce57c

+ 0 - 128
.github/workflows/fedora-33.yml

@@ -1,128 +0,0 @@
-on:
-  push:
-    tags:
-      - 'fedora-33-*'
-
-name: Fedora 33
-
-env:
-  GPG_KEY_ID: 56C464BAAC421453
-
-jobs:
-  build:
-    name: Build Kernel
-    runs-on: ubuntu-latest
-    container: fedora:33
-    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 pkg/fedora/kernel-surface/kernel-surface.spec
-
-    - name: Setup secureboot certificate
-      env:
-        SB_KEY: ${{ secrets.SURFACE_SB_KEY }}
-      run: |
-        cd pkg
-
-        # Install the surface secureboot certificate
-        echo "$SB_KEY" | base64 -d > fedora/kernel-surface/surface.key
-        cp keys/surface.crt fedora/kernel-surface/surface.crt
-
-    - name: Build packages
-      run: |
-        cd pkg/fedora/kernel-surface
-
-        # Build the .rpm packages
-        ../makerpm -- --with=signkernel -ba
-
-    - name: Sign packages
-      env:
-        GPG_KEY: ${{ secrets.SURFACE_GPG_KEY }}
-      run: |
-        cd pkg/fedora/kernel-surface/out/x86_64
-
-        # 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-33-latest
-        path: pkg/fedora/kernel-surface/out/x86_64
-
-  release:
-    name: Publish release
-    needs: [build]
-    runs-on: ubuntu-latest
-    steps:
-    - name: Download artifacts
-      uses: actions/download-artifact@v1
-      with:
-        name: fedora-33-latest
-
-    - name: Upload assets
-      uses: svenstaro/upload-release-action@v1-release
-      with:
-        repo_token: ${{ secrets.GITHUB_BOT_TOKEN }}
-        file: ./*-latest/*
-        tag: ${{ github.ref }}
-        overwrite: true
-        file_glob: true
-
-  repo:
-    name: Update package repository
-    needs: [release]
-    runs-on: ubuntu-latest
-    container: fedora:33
-    steps:
-    - name: Install dependencies
-      run: |
-        dnf install -y git findutils
-
-    - name: Download artifacts
-      uses: actions/download-artifact@v1
-      with:
-        name: fedora-33-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-33-latest/* repo/fedora/f33
-        cd repo/fedora/f33
-
-        # 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 "linux-surface:$GIT_TAG/$(basename $pkg)" > $pkg.blob
-          rm $pkg
-        done
-
-        # set git identity
-        git config --global user.email "surfacebot@users.noreply.github.com"
-        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 33 kernel"
-        git push --set-upstream origin "${update_branch}"

+ 0 - 3
pkg/fedora/kernel-surface/kernel-surface.spec

@@ -4,18 +4,15 @@
 
 %global kernel_tag_fc35 kernel-5.14.20-300.fc35
 %global kernel_tag_fc34 kernel-5.14.20-200.fc34
-%global kernel_tag_fc33 kernel-5.14.16-101.fc33
 
 %global kernel_release_fc35 1
 %global kernel_release_fc34 1
-%global kernel_release_fc33 2
 
 # This is what is printed in the GRUB menu. These cannot be fetched from the
 # buildhost, because in a container this will also say container. To get the
 # same text as the default kernels, just hardcode it. Hey, this is important!
 %global fedora_title_fc35 35 (Thirty Five)
 %global fedora_title_fc34 34 (Thirty Four)
-%global fedora_title_fc33 33 (Thirty Three)
 
 %global ls_patches_commit cf4d17dd814fefa2ce3a2c787d55b66567aed0dd