8585 run : mkdir release && mv pkg/bin/*.tar.xz release
8686
8787 - name : Upload artifacts
88- uses : actions/upload-artifact@v1
88+ uses : actions/upload-artifact@v3
8989 with :
9090 name : binary-latest
9191 path : release
@@ -129,7 +129,7 @@ jobs:
129129 run : mkdir release && mv pkg/deb/*.deb release
130130
131131 - name : Upload artifacts
132- uses : actions/upload-artifact@v1
132+ uses : actions/upload-artifact@v3
133133 with :
134134 name : debian-latest
135135 path : release
@@ -174,7 +174,7 @@ jobs:
174174 rpm --resign *.rpm --define "_gpg_name $GPG_KEY_ID"
175175
176176 - name : Upload artifacts
177- uses : actions/upload-artifact@v1
177+ uses : actions/upload-artifact@v3
178178 with :
179179 name : fedora-37-latest
180180 path : pkg/fedora/out/x86_64
@@ -219,91 +219,45 @@ jobs:
219219 rpm --resign *.rpm --define "_gpg_name $GPG_KEY_ID"
220220
221221 - name : Upload artifacts
222- uses : actions/upload-artifact@v1
222+ uses : actions/upload-artifact@v3
223223 with :
224224 name : fedora-36-latest
225225 path : pkg/fedora/out/x86_64
226226
227- build-f35 :
228- if : github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')
229-
230- name : Build Fedora 35 package
231- runs-on : ubuntu-latest
232- needs : [lint, test]
233- container :
234- image : fedora:35
235- options : --security-opt seccomp=unconfined
236-
237- steps :
238- - name : Checkout code
239- uses : actions/checkout@v3
240-
241- - name : Install build dependencies
242- run : |
243- dnf distro-sync -y
244- dnf install -y rpmdevtools rpm-sign 'dnf-command(builddep)'
245- dnf builddep -y pkg/fedora/surface-control.spec
246-
247- - name : Build package
248- run : |
249- cd pkg/fedora
250- # Build the .rpm packages
251- ./makerpm
252-
253- - name : Sign packages
254- env :
255- GPG_KEY_ID : 56C464BAAC421453
256- GPG_KEY : ${{ secrets.SURFACE_GPG_KEY }}
257- run : |
258- cd pkg/fedora/out/x86_64
259-
260- # import GPG key
261- echo "$GPG_KEY" | base64 -d | gpg --import --no-tty --batch --yes
262-
263- # sign package
264- rpm --resign *.rpm --define "_gpg_name $GPG_KEY_ID"
265-
266- - name : Upload artifacts
267- uses : actions/upload-artifact@v1
268- with :
269- name : fedora-35-latest
270- path : pkg/fedora/out/x86_64
271-
272227 release :
273228 if : github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')
274229
275230 name : Publish release
276- needs : [build-bin, build-deb, build-f37, build-f36, build-f35 ]
231+ needs : [build-bin, build-deb, build-f37, build-f36]
277232 runs-on : ubuntu-latest
278233
279234 steps :
280235 - name : Download binary artifacts
281- uses : actions/download-artifact@v1
236+ uses : actions/download-artifact@v3
282237 with :
283238 name : binary-latest
239+ path : binary-latest
284240
285241 - name : Download Debian artifacts
286- uses : actions/download-artifact@v1
242+ uses : actions/download-artifact@v3
287243 with :
288244 name : debian-latest
245+ path : debian-latest
289246
290247 - name : Download Fedora 37 artifacts
291- uses : actions/download-artifact@v1
248+ uses : actions/download-artifact@v3
292249 with :
293250 name : fedora-37-latest
251+ path : fedora-37-latest
294252
295253 - name : Download Fedora 36 artifacts
296- uses : actions/download-artifact@v1
254+ uses : actions/download-artifact@v3
297255 with :
298256 name : fedora-36-latest
299-
300- - name : Download Fedora 35 artifacts
301- uses : actions/download-artifact@v1
302- with :
303- name : fedora-35-latest
257+ path : fedora-36-latest
304258
305259 - name : Upload assets
306- uses : svenstaro/upload-release-action@v1-release
260+ uses : svenstaro/upload-release-action@v2
307261 with :
308262 repo_token : ${{ secrets.GITHUB_TOKEN }}
309263 file : ./*-latest/*
@@ -323,9 +277,10 @@ jobs:
323277 apt-get install -y git
324278
325279 - name : Download artifacts
326- uses : actions/download-artifact@v1
280+ uses : actions/download-artifact@v3
327281 with :
328282 name : debian-latest
283+ path : debian-latest
329284
330285 - name : Update repository
331286 env :
@@ -375,9 +330,10 @@ jobs:
375330 dnf install -y git findutils
376331
377332 - name : Download artifacts
378- uses : actions/download-artifact@v1
333+ uses : actions/download-artifact@v3
379334 with :
380335 name : fedora-37-latest
336+ path : fedora-37-latest
381337
382338 - name : Update repository
383339 env :
@@ -427,9 +383,10 @@ jobs:
427383 dnf install -y git findutils
428384
429385 - name : Download artifacts
430- uses : actions/download-artifact@v1
386+ uses : actions/download-artifact@v3
431387 with :
432388 name : fedora-36-latest
389+ path : fedora-36-latest
433390
434391 - name : Update repository
435392 env :
@@ -465,55 +422,3 @@ jobs:
465422 git add .
466423 git commit -m "Update Fedora 36 surface-control"
467424 git push --set-upstream origin "${update_branch}"
468-
469- repo-f35 :
470- name : Update Fedora 35 package repository
471- needs : [release]
472- runs-on : ubuntu-latest
473- container :
474- image : fedora:35
475- options : --security-opt seccomp=unconfined
476- steps :
477- - name : Install dependencies
478- run : |
479- dnf install -y git findutils
480-
481- - name : Download artifacts
482- uses : actions/download-artifact@v1
483- with :
484- name : fedora-35-latest
485-
486- - name : Update repository
487- env :
488- SURFACEBOT_TOKEN : ${{ secrets.GITHUB_BOT_TOKEN }}
489- BRANCH_STAGING : u/staging
490- GIT_REF : ${{ github.ref }}
491- run : |
492- repo="https://surfacebot:${SURFACEBOT_TOKEN}@github.com/linux-surface/repo.git"
493-
494- # clone package repository
495- git clone -b "${BRANCH_STAGING}" "${repo}" repo
496-
497- # copy packages
498- cp fedora-35-latest/* repo/fedora/f35
499- cd repo/fedora/f35
500-
501- # parse git tag from ref
502- GIT_TAG=$(echo $GIT_REF | sed 's|^refs/tags/||g')
503-
504- # convert packages into references
505- for pkg in $(find . -name '*.rpm'); do
506- echo "surface-control:$GIT_TAG/$(basename $pkg)" > $pkg.blob
507- rm $pkg
508- done
509-
510- # set git identity
511- git config --global user.email "[email protected] " 512- git config --global user.name "surfacebot"
513-
514- # commit and push
515- update_branch="${BRANCH_STAGING}-$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
516- git checkout -b "${update_branch}"
517- git add .
518- git commit -m "Update Fedora 35 surface-control"
519- git push --set-upstream origin "${update_branch}"
0 commit comments