@@ -104,45 +104,6 @@ jobs:
104104 name : arch-latest
105105 path : release
106106
107- build-f39 :
108- name : Build Fedora 39 package
109- runs-on : ubuntu-latest
110- container : registry.fedoraproject.org/fedora:39
111- steps :
112- - name : Checkout code
113- uses : actions/checkout@v4
114-
115- - name : Install build dependencies
116- run : |
117- dnf distro-sync -y
118- dnf install -y rpmdevtools rpm-sign 'dnf-command(builddep)'
119- dnf builddep -y fedora/surface-secureboot.spec
120-
121- - name : Build package
122- run : |
123- cd fedora
124-
125- # Build the .rpm packages
126- ./makerpm
127-
128- - name : Sign packages
129- env :
130- GPG_KEY : ${{ secrets.LINUX_SURFACE_GPG_KEY }}
131- run : |
132- cd fedora/out/noarch
133-
134- # import GPG key
135- echo "$GPG_KEY" | base64 -d | gpg --import --no-tty --batch --yes
136-
137- # sign packages
138- rpm --resign *.rpm --define "_gpg_name $GPG_KEY_ID"
139-
140- - name : Upload artifacts
141- uses : actions/upload-artifact@v4
142- with :
143- name : fedora-39-latest
144- path : fedora/out/noarch
145-
146107 build-f40 :
147108 name : Build Fedora 40 package
148109 runs-on : ubuntu-latest
@@ -223,7 +184,7 @@ jobs:
223184
224185 release :
225186 name : Publish release
226- needs : [build-deb, build-arch, build-f39, build- f40, build-f41]
187+ needs : [build-deb, build-arch, build-f40, build-f41]
227188 runs-on : ubuntu-latest
228189 steps :
229190 - name : Download Debian artifacts
@@ -238,12 +199,6 @@ jobs:
238199 name : arch-latest
239200 path : arch-latest
240201
241- - name : Download Fedora 39 artifacts
242- uses : actions/download-artifact@v4
243- with :
244- name : fedora-39-latest
245- path : fedora-39-latest
246-
247202 - name : Download Fedora 40 artifacts
248203 uses : actions/download-artifact@v4
249204 with :
@@ -367,57 +322,6 @@ jobs:
367322 git commit -m "Update Arch Linux secure-boot MOK"
368323 git push --set-upstream origin "${update_branch}"
369324
370- repo-f39 :
371- name : Update Fedora 39 package repository
372- needs : [release]
373- runs-on : ubuntu-latest
374- container : registry.fedoraproject.org/fedora:39
375- steps :
376- - name : Install dependencies
377- run : |
378- dnf install -y git findutils
379-
380- - name : Download artifacts
381- uses : actions/download-artifact@v4
382- with :
383- name : fedora-39-latest
384- path : fedora-39-latest
385-
386- - name : Update repository
387- env :
388- SURFACEBOT_TOKEN : ${{ secrets.LINUX_SURFACE_BOT_TOKEN }}
389- BRANCH_STAGING : u/staging
390- GIT_REF : ${{ github.ref }}
391- run : |
392- repo="https://surfacebot:${SURFACEBOT_TOKEN}@github.com/linux-surface/repo.git"
393-
394- # clone package repository
395- git clone -b "${BRANCH_STAGING}" "${repo}" repo
396-
397- # copy packages
398- cp fedora-39-latest/* repo/fedora/f39
399- cd repo/fedora/f39
400-
401- # parse git tag from ref
402- GIT_TAG=$(echo $GIT_REF | sed 's|^refs/tags/||g')
403-
404- # convert packages into references
405- for pkg in $(find . -name '*.rpm'); do
406- echo "secureboot-mok:$GIT_TAG/$(basename $pkg)" > $pkg.blob
407- rm $pkg
408- done
409-
410- # set git identity
411- git config --global user.email "[email protected] " 412- git config --global user.name "surfacebot"
413-
414- # commit and push
415- update_branch="${BRANCH_STAGING}-$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
416- git checkout -b "${update_branch}"
417- git add .
418- git commit -m "Update Fedora 39 secure-boot MOK"
419- git push --set-upstream origin "${update_branch}"
420-
421325 repo-f40 :
422326 name : Update Fedora 40 package repository
423327 needs : [release]
0 commit comments