@@ -196,67 +196,9 @@ jobs:
196196 name : fedora-37-latest
197197 path : pkg/fedora/release
198198
199- build-f36 :
200- name : Build Fedora 36 package
201- runs-on : ubuntu-latest
202- container :
203- image : fedora:36
204- options : --security-opt seccomp=unconfined
205- steps :
206- - name : Checkout code
207- uses : actions/checkout@v3
208-
209- - name : Install build dependencies
210- run : |
211- dnf distro-sync -y
212- dnf install -y make rpmdevtools rpm-sign 'dnf-command(builddep)'
213- dnf builddep -y pkg/fedora/libwacom-surface.spec
214-
215- - name : Build package
216- run : |
217- cd pkg/fedora
218-
219- # Build the .rpm packages
220- ./makerpm
221-
222- - name : Sign packages
223- env :
224- GPG_KEY_ID : 56C464BAAC421453
225- GPG_KEY : ${{ secrets.LINUX_SURFACE_GPG_KEY }}
226- run : |
227- cd pkg/fedora/out
228-
229- # import GPG key
230- echo "$GPG_KEY" | base64 -d | gpg --import --no-tty --batch --yes
231-
232- # sign package
233- cd noarch
234- rpm --resign *.rpm --define "_gpg_name $GPG_KEY_ID"
235-
236- cd ..
237-
238- cd x86_64
239- rpm --resign *.rpm --define "_gpg_name $GPG_KEY_ID"
240-
241- - name : Prepare artifacts
242- run : |
243- cd pkg/fedora
244- mkdir release
245-
246- cp out/noarch/* release/
247- cp out/x86_64/* release/
248-
249- rm release/libwacom-surface-devel-*
250-
251- - name : Upload artifacts
252- uses : actions/upload-artifact@v3
253- with :
254- name : fedora-36-latest
255- path : pkg/fedora/release
256-
257199 release :
258200 name : Publish release
259- needs : [build-deb, build-f38, build-f37, build-f36 ]
201+ needs : [build-deb, build-f38, build-f37]
260202 runs-on : ubuntu-latest
261203 steps :
262204 - name : Download Debian artifacts
@@ -277,12 +219,6 @@ jobs:
277219 name : fedora-37-latest
278220 path : fedora-37-latest
279221
280- - name : Download Fedora 36 artifacts
281- uses : actions/download-artifact@v3
282- with :
283- name : fedora-36-latest
284- path : fedora-36-latest
285-
286222 - name : Upload assets
287223 uses : svenstaro/upload-release-action@v2
288224 with :
@@ -449,56 +385,3 @@ jobs:
449385 git add .
450386 git commit -m "Update Fedora 37 libwacom"
451387 git push --set-upstream origin "${update_branch}"
452-
453- repo-f36 :
454- name : Update Fedora 36 package repository
455- needs : [release]
456- runs-on : ubuntu-latest
457- container :
458- image : fedora:36
459- options : --security-opt seccomp=unconfined
460- steps :
461- - name : Install dependencies
462- run : |
463- dnf install -y git findutils
464-
465- - name : Download artifacts
466- uses : actions/download-artifact@v3
467- with :
468- name : fedora-36-latest
469- path : fedora-36-latest
470-
471- - name : Update repository
472- env :
473- SURFACEBOT_TOKEN : ${{ secrets.LINUX_SURFACE_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-36-latest/* repo/fedora/f36
484- cd repo/fedora/f36
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 "libwacom-surface:$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 36 libwacom"
504- git push --set-upstream origin "${update_branch}"
0 commit comments