@@ -221,65 +221,9 @@ jobs:
221221 name : fedora-33-latest
222222 path : pkg/fedora/release
223223
224- build-f32 :
225- name : Build Fedora 32 package
226- runs-on : ubuntu-latest
227- container : fedora:32
228- steps :
229- - name : Checkout code
230- uses : actions/checkout@v2
231-
232- - name : Install build dependencies
233- run : |
234- dnf distro-sync -y
235- dnf install -y rpmdevtools rpm-sign 'dnf-command(builddep)'
236- dnf builddep -y pkg/fedora/libwacom-surface.spec
237-
238- - name : Build package
239- run : |
240- cd pkg/fedora
241-
242- # Build the .rpm packages
243- ./makerpm
244-
245- - name : Sign packages
246- env :
247- GPG_KEY_ID : 56C464BAAC421453
248- GPG_KEY : ${{ secrets.SURFACE_GPG_KEY }}
249- run : |
250- cd pkg/fedora/out
251-
252- # import GPG key
253- echo "$GPG_KEY" | base64 -d | gpg --import --no-tty --batch --yes
254-
255- # sign package
256- cd noarch
257- rpm --resign *.rpm --define "_gpg_name $GPG_KEY_ID"
258-
259- cd ..
260-
261- cd x86_64
262- rpm --resign *.rpm --define "_gpg_name $GPG_KEY_ID"
263-
264- - name : Prepare artifacts
265- run : |
266- cd pkg/fedora
267- mkdir release
268-
269- cp out/noarch/* release/
270- cp out/x86_64/* release/
271-
272- rm release/libwacom-surface-devel-*
273-
274- - name : Upload artifacts
275- uses : actions/upload-artifact@v1
276- with :
277- name : fedora-32-latest
278- path : pkg/fedora/release
279-
280224 release :
281225 name : Publish release
282- needs : [build-deb, build-f35, build-f34, build-f33, build-f32 ]
226+ needs : [build-deb, build-f35, build-f34, build-f33]
283227 runs-on : ubuntu-latest
284228 steps :
285229 - name : Download Debian artifacts
@@ -302,11 +246,6 @@ jobs:
302246 with :
303247 name : fedora-33-latest
304248
305- - name : Download Fedora 32 artifacts
306- uses : actions/download-artifact@v1
307- with :
308- name : fedora-32-latest
309-
310249 - name : Upload assets
311250 uses : svenstaro/upload-release-action@v1-release
312251 with :
@@ -516,53 +455,3 @@ jobs:
516455 git add .
517456 git commit -m "Update Fedora 33 libwacom"
518457 git push --set-upstream origin "${update_branch}"
519-
520- repo-f32 :
521- name : Update Fedora 32 package repository
522- needs : [release]
523- runs-on : ubuntu-latest
524- container : fedora:32
525- steps :
526- - name : Install dependencies
527- run : |
528- dnf install -y git findutils
529-
530- - name : Download artifacts
531- uses : actions/download-artifact@v1
532- with :
533- name : fedora-32-latest
534-
535- - name : Update repository
536- env :
537- SURFACEBOT_TOKEN : ${{ secrets.GITHUB_BOT_TOKEN }}
538- BRANCH_STAGING : u/staging
539- GIT_REF : ${{ github.ref }}
540- run : |
541- repo="https://surfacebot:${SURFACEBOT_TOKEN}@github.com/linux-surface/repo.git"
542-
543- # clone package repository
544- git clone -b "${BRANCH_STAGING}" "${repo}" repo
545-
546- # copy packages
547- cp fedora-32-latest/* repo/fedora/f32
548- cd repo/fedora/f32
549-
550- # parse git tag from ref
551- GIT_TAG=$(echo $GIT_REF | sed 's|^refs/tags/||g')
552-
553- # convert packages into references
554- for pkg in $(find . -name '*.rpm'); do
555- echo "libwacom-surface:$GIT_TAG/$(basename $pkg)" > $pkg.blob
556- rm $pkg
557- done
558-
559- # set git identity
560- git config --global user.email "[email protected] " 561- git config --global user.name "surfacebot"
562-
563- # commit and push
564- update_branch="${BRANCH_STAGING}-$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
565- git checkout -b "${update_branch}"
566- git add .
567- git commit -m "Update Fedora 32 libwacom"
568- git push --set-upstream origin "${update_branch}"
0 commit comments