@@ -224,54 +224,11 @@ jobs:
224224 name : fedora-35-latest
225225 path : pkg/fedora/out/x86_64
226226
227- build-f34 :
228- if : github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')
229-
230- name : Build Fedora 34 package
231- runs-on : ubuntu-latest
232- needs : [lint, test]
233- container : fedora:34
234-
235- steps :
236- - name : Checkout code
237- uses : actions/checkout@v2
238-
239- - name : Install build dependencies
240- run : |
241- dnf distro-sync -y
242- dnf install -y rpmdevtools rpm-sign 'dnf-command(builddep)'
243- dnf builddep -y pkg/fedora/surface-control.spec
244-
245- - name : Build package
246- run : |
247- cd pkg/fedora
248- # Build the .rpm packages
249- ./makerpm
250-
251- - name : Sign packages
252- env :
253- GPG_KEY_ID : 56C464BAAC421453
254- GPG_KEY : ${{ secrets.SURFACE_GPG_KEY }}
255- run : |
256- cd pkg/fedora/out/x86_64
257-
258- # import GPG key
259- echo "$GPG_KEY" | base64 -d | gpg --import --no-tty --batch --yes
260-
261- # sign package
262- rpm --resign *.rpm --define "_gpg_name $GPG_KEY_ID"
263-
264- - name : Upload artifacts
265- uses : actions/upload-artifact@v1
266- with :
267- name : fedora-34-latest
268- path : pkg/fedora/out/x86_64
269-
270227 release :
271228 if : github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')
272229
273230 name : Publish release
274- needs : [build-bin, build-deb, build-f36, build-f35, build-f34 ]
231+ needs : [build-bin, build-deb, build-f36, build-f35]
275232 runs-on : ubuntu-latest
276233
277234 steps :
@@ -295,11 +252,6 @@ jobs:
295252 with :
296253 name : fedora-35-latest
297254
298- - name : Download Fedora 34 artifacts
299- uses : actions/download-artifact@v1
300- with :
301- name : fedora-34-latest
302-
303255 - name : Upload assets
304256 uses : svenstaro/upload-release-action@v1-release
305257 with :
@@ -463,53 +415,3 @@ jobs:
463415 git add .
464416 git commit -m "Update Fedora 35 surface-control"
465417 git push --set-upstream origin "${update_branch}"
466-
467- repo-f34 :
468- name : Update Fedora 34 package repository
469- needs : [release]
470- runs-on : ubuntu-latest
471- container : fedora:34
472- steps :
473- - name : Install dependencies
474- run : |
475- dnf install -y git findutils
476-
477- - name : Download artifacts
478- uses : actions/download-artifact@v1
479- with :
480- name : fedora-34-latest
481-
482- - name : Update repository
483- env :
484- SURFACEBOT_TOKEN : ${{ secrets.GITHUB_BOT_TOKEN }}
485- BRANCH_STAGING : u/staging
486- GIT_REF : ${{ github.ref }}
487- run : |
488- repo="https://surfacebot:${SURFACEBOT_TOKEN}@github.com/linux-surface/repo.git"
489-
490- # clone package repository
491- git clone -b "${BRANCH_STAGING}" "${repo}" repo
492-
493- # copy packages
494- cp fedora-34-latest/* repo/fedora/f34
495- cd repo/fedora/f34
496-
497- # parse git tag from ref
498- GIT_TAG=$(echo $GIT_REF | sed 's|^refs/tags/||g')
499-
500- # convert packages into references
501- for pkg in $(find . -name '*.rpm'); do
502- echo "surface-control:$GIT_TAG/$(basename $pkg)" > $pkg.blob
503- rm $pkg
504- done
505-
506- # set git identity
507- git config --global user.email "[email protected] " 508- git config --global user.name "surfacebot"
509-
510- # commit and push
511- update_branch="${BRANCH_STAGING}-$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
512- git checkout -b "${update_branch}"
513- git add .
514- git commit -m "Update Fedora 34 surface-control"
515- git push --set-upstream origin "${update_branch}"
0 commit comments