Skip to content

Commit 37d4600

Browse files
committed
pkg: Remove support for Fedora 34
1 parent d87d083 commit 37d4600

File tree

1 file changed

+1
-99
lines changed

1 file changed

+1
-99
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -213,54 +213,11 @@ jobs:
213213
name: fedora-35-latest
214214
path: pkg/fedora/out/x86_64
215215

216-
build-f34:
217-
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')
218-
219-
name: Build Fedora 34 package
220-
runs-on: ubuntu-latest
221-
needs: [lint, test]
222-
container: fedora:34
223-
224-
steps:
225-
- name: Checkout code
226-
uses: actions/checkout@v2
227-
228-
- name: Install build dependencies
229-
run: |
230-
dnf distro-sync -y
231-
dnf install -y rpmdevtools rpm-sign 'dnf-command(builddep)'
232-
dnf builddep -y pkg/fedora/surface-dtx-daemon.spec
233-
234-
- name: Build package
235-
run: |
236-
cd pkg/fedora
237-
# Build the .rpm packages
238-
./makerpm
239-
240-
- name: Sign packages
241-
env:
242-
GPG_KEY_ID: 56C464BAAC421453
243-
GPG_KEY: ${{ secrets.SURFACE_GPG_KEY }}
244-
run: |
245-
cd pkg/fedora/out/x86_64
246-
247-
# import GPG key
248-
echo "$GPG_KEY" | base64 -d | gpg --import --no-tty --batch --yes
249-
250-
# sign package
251-
rpm --resign *.rpm --define "_gpg_name $GPG_KEY_ID"
252-
253-
- name: Upload artifacts
254-
uses: actions/upload-artifact@v1
255-
with:
256-
name: fedora-34-latest
257-
path: pkg/fedora/out/x86_64
258-
259216
release:
260217
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')
261218

262219
name: Publish release
263-
needs: [build-bin, build-deb, build-f36, build-f35, build-f34]
220+
needs: [build-bin, build-deb, build-f36, build-f35]
264221
runs-on: ubuntu-latest
265222

266223
steps:
@@ -284,11 +241,6 @@ jobs:
284241
with:
285242
name: fedora-35-latest
286243

287-
- name: Download Fedora 34 artifacts
288-
uses: actions/download-artifact@v1
289-
with:
290-
name: fedora-34-latest
291-
292244
- name: Upload assets
293245
uses: svenstaro/upload-release-action@v1-release
294246
with:
@@ -452,53 +404,3 @@ jobs:
452404
git add .
453405
git commit -m "Update Fedora 35 DTX daemon"
454406
git push --set-upstream origin "${update_branch}"
455-
456-
repo-f34:
457-
name: Update Fedora 34 package repository
458-
needs: [release]
459-
runs-on: ubuntu-latest
460-
container: fedora:34
461-
steps:
462-
- name: Install dependencies
463-
run: |
464-
dnf install -y git findutils
465-
466-
- name: Download artifacts
467-
uses: actions/download-artifact@v1
468-
with:
469-
name: fedora-34-latest
470-
471-
- name: Update repository
472-
env:
473-
SURFACEBOT_TOKEN: ${{ secrets.GITHUB_BOT_TOKEN }}
474-
BRANCH_STAGING: u/staging
475-
GIT_REF: ${{ github.ref }}
476-
run: |
477-
repo="https://surfacebot:${SURFACEBOT_TOKEN}@github.com/linux-surface/repo.git"
478-
479-
# clone package repository
480-
git clone -b "${BRANCH_STAGING}" "${repo}" repo
481-
482-
# copy packages
483-
cp fedora-34-latest/* repo/fedora/f34
484-
cd repo/fedora/f34
485-
486-
# parse git tag from ref
487-
GIT_TAG=$(echo $GIT_REF | sed 's|^refs/tags/||g')
488-
489-
# convert packages into references
490-
for pkg in $(find . -name '*.rpm'); do
491-
echo "surface-dtx-daemon:$GIT_TAG/$(basename $pkg)" > $pkg.blob
492-
rm $pkg
493-
done
494-
495-
# set git identity
496-
git config --global user.email "[email protected]"
497-
git config --global user.name "surfacebot"
498-
499-
# commit and push
500-
update_branch="${BRANCH_STAGING}-$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
501-
git checkout -b "${update_branch}"
502-
git add .
503-
git commit -m "Update Fedora 34 DTX daemon"
504-
git push --set-upstream origin "${update_branch}"

0 commit comments

Comments
 (0)