Skip to content

Commit 5a588a6

Browse files
committed
Remove support for Fedora 35
1 parent b40e83c commit 5a588a6

File tree

1 file changed

+1
-99
lines changed

1 file changed

+1
-99
lines changed

.github/workflows/package.yml

Lines changed: 1 addition & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -143,47 +143,6 @@ jobs:
143143
name: fedora-36-latest
144144
path: fedora/out/noarch
145145

146-
build-f35:
147-
name: Build Fedora 35 package
148-
runs-on: ubuntu-latest
149-
container:
150-
image: fedora:35
151-
options: --security-opt seccomp=unconfined
152-
steps:
153-
- name: Checkout code
154-
uses: actions/checkout@v2
155-
156-
- name: Install build dependencies
157-
run: |
158-
dnf distro-sync -y
159-
dnf install -y rpmdevtools rpm-sign 'dnf-command(builddep)'
160-
dnf builddep -y fedora/surface-secureboot.spec
161-
162-
- name: Build package
163-
run: |
164-
cd fedora
165-
166-
# Build the .rpm packages
167-
./makerpm
168-
169-
- name: Sign packages
170-
env:
171-
GPG_KEY: ${{ secrets.SURFACE_GPG_KEY }}
172-
run: |
173-
cd fedora/out/noarch
174-
175-
# import GPG key
176-
echo "$GPG_KEY" | base64 -d | gpg --import --no-tty --batch --yes
177-
178-
# sign packages
179-
rpm --resign *.rpm --define "_gpg_name $GPG_KEY_ID"
180-
181-
- name: Upload artifacts
182-
uses: actions/upload-artifact@v1
183-
with:
184-
name: fedora-35-latest
185-
path: fedora/out/noarch
186-
187146
build-f37:
188147
name: Build Fedora 37 package
189148
runs-on: ubuntu-latest
@@ -225,7 +184,7 @@ jobs:
225184

226185
release:
227186
name: Publish release
228-
needs: [build-deb, build-arch, build-f36, build-f35, build-f37]
187+
needs: [build-deb, build-arch, build-f36, build-f37]
229188
runs-on: ubuntu-latest
230189
steps:
231190
- name: Download Debian artifacts
@@ -243,11 +202,6 @@ jobs:
243202
with:
244203
name: fedora-36-latest
245204

246-
- name: Download Fedora 35 artifacts
247-
uses: actions/download-artifact@v1
248-
with:
249-
name: fedora-35-latest
250-
251205
- name: Download Fedora 37 artifacts
252206
uses: actions/download-artifact@v1
253207
with:
@@ -414,58 +368,6 @@ jobs:
414368
git commit -m "Update Fedora 36 secure-boot MOK"
415369
git push --set-upstream origin "${update_branch}"
416370
417-
repo-f35:
418-
name: Update Fedora 35 package repository
419-
needs: [release]
420-
runs-on: ubuntu-latest
421-
container:
422-
image: fedora:35
423-
options: --security-opt seccomp=unconfined
424-
steps:
425-
- name: Install dependencies
426-
run: |
427-
dnf install -y git findutils
428-
429-
- name: Download artifacts
430-
uses: actions/download-artifact@v1
431-
with:
432-
name: fedora-35-latest
433-
434-
- name: Update repository
435-
env:
436-
SURFACEBOT_TOKEN: ${{ secrets.GITHUB_BOT_TOKEN }}
437-
BRANCH_STAGING: u/staging
438-
GIT_REF: ${{ github.ref }}
439-
run: |
440-
repo="https://surfacebot:${SURFACEBOT_TOKEN}@github.com/linux-surface/repo.git"
441-
442-
# clone package repository
443-
git clone -b "${BRANCH_STAGING}" "${repo}" repo
444-
445-
# copy packages
446-
cp fedora-35-latest/* repo/fedora/f35
447-
cd repo/fedora/f35
448-
449-
# parse git tag from ref
450-
GIT_TAG=$(echo $GIT_REF | sed 's|^refs/tags/||g')
451-
452-
# convert packages into references
453-
for pkg in $(find . -name '*.rpm'); do
454-
echo "secureboot-mok:$GIT_TAG/$(basename $pkg)" > $pkg.blob
455-
rm $pkg
456-
done
457-
458-
# set git identity
459-
git config --global user.email "[email protected]"
460-
git config --global user.name "surfacebot"
461-
462-
# commit and push
463-
update_branch="${BRANCH_STAGING}-$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
464-
git checkout -b "${update_branch}"
465-
git add .
466-
git commit -m "Update Fedora 35 secure-boot MOK"
467-
git push --set-upstream origin "${update_branch}"
468-
469371
repo-f37:
470372
name: Update Fedora 37 package repository
471373
needs: [release]

0 commit comments

Comments
 (0)