@@ -194,65 +194,9 @@ jobs:
194194 name : fedora-35-latest
195195 path : pkg/fedora/release
196196
197- build-f34 :
198- name : Build Fedora 34 package
199- runs-on : ubuntu-latest
200- container : fedora:34
201- steps :
202- - name : Checkout code
203- uses : actions/checkout@v2
204-
205- - name : Install build dependencies
206- run : |
207- dnf distro-sync -y
208- dnf install -y make rpmdevtools rpm-sign 'dnf-command(builddep)'
209- dnf builddep -y pkg/fedora/libwacom-surface.spec
210-
211- - name : Build package
212- run : |
213- cd pkg/fedora
214-
215- # Build the .rpm packages
216- ./makerpm
217-
218- - name : Sign packages
219- env :
220- GPG_KEY_ID : 56C464BAAC421453
221- GPG_KEY : ${{ secrets.SURFACE_GPG_KEY }}
222- run : |
223- cd pkg/fedora/out
224-
225- # import GPG key
226- echo "$GPG_KEY" | base64 -d | gpg --import --no-tty --batch --yes
227-
228- # sign package
229- cd noarch
230- rpm --resign *.rpm --define "_gpg_name $GPG_KEY_ID"
231-
232- cd ..
233-
234- cd x86_64
235- rpm --resign *.rpm --define "_gpg_name $GPG_KEY_ID"
236-
237- - name : Prepare artifacts
238- run : |
239- cd pkg/fedora
240- mkdir release
241-
242- cp out/noarch/* release/
243- cp out/x86_64/* release/
244-
245- rm release/libwacom-surface-devel-*
246-
247- - name : Upload artifacts
248- uses : actions/upload-artifact@v1
249- with :
250- name : fedora-34-latest
251- path : pkg/fedora/release
252-
253197 release :
254198 name : Publish release
255- needs : [build-deb, build-f36, build-f35, build-f34 ]
199+ needs : [build-deb, build-f36, build-f35]
256200 runs-on : ubuntu-latest
257201 steps :
258202 - name : Download Debian artifacts
@@ -270,11 +214,6 @@ jobs:
270214 with :
271215 name : fedora-35-latest
272216
273- - name : Download Fedora 34 artifacts
274- uses : actions/download-artifact@v1
275- with :
276- name : fedora-34-latest
277-
278217 - name : Upload assets
279218 uses : svenstaro/upload-release-action@v1-release
280219 with :
@@ -438,53 +377,3 @@ jobs:
438377 git add .
439378 git commit -m "Update Fedora 35 libwacom"
440379 git push --set-upstream origin "${update_branch}"
441-
442- repo-f34 :
443- name : Update Fedora 34 package repository
444- needs : [release]
445- runs-on : ubuntu-latest
446- container : fedora:34
447- steps :
448- - name : Install dependencies
449- run : |
450- dnf install -y git findutils
451-
452- - name : Download artifacts
453- uses : actions/download-artifact@v1
454- with :
455- name : fedora-34-latest
456-
457- - name : Update repository
458- env :
459- SURFACEBOT_TOKEN : ${{ secrets.GITHUB_BOT_TOKEN }}
460- BRANCH_STAGING : u/staging
461- GIT_REF : ${{ github.ref }}
462- run : |
463- repo="https://surfacebot:${SURFACEBOT_TOKEN}@github.com/linux-surface/repo.git"
464-
465- # clone package repository
466- git clone -b "${BRANCH_STAGING}" "${repo}" repo
467-
468- # copy packages
469- cp fedora-34-latest/* repo/fedora/f34
470- cd repo/fedora/f34
471-
472- # parse git tag from ref
473- GIT_TAG=$(echo $GIT_REF | sed 's|^refs/tags/||g')
474-
475- # convert packages into references
476- for pkg in $(find . -name '*.rpm'); do
477- echo "libwacom-surface:$GIT_TAG/$(basename $pkg)" > $pkg.blob
478- rm $pkg
479- done
480-
481- # set git identity
482- git config --global user.email "surfacebot@users.noreply.github.com"
483- git config --global user.name "surfacebot"
484-
485- # commit and push
486- update_branch="${BRANCH_STAGING}-$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
487- git checkout -b "${update_branch}"
488- git add .
489- git commit -m "Update Fedora 34 libwacom"
490- git push --set-upstream origin "${update_branch}"
0 commit comments