@@ -180,48 +180,9 @@ jobs:
180180 name : fedora-33-latest
181181 path : fedora/out/noarch
182182
183- build-f32 :
184- name : Build Fedora 32 package
185- runs-on : ubuntu-latest
186- container : fedora:32
187- steps :
188- - name : Checkout code
189- uses : actions/checkout@v2
190-
191- - name : Install build dependencies
192- run : |
193- dnf distro-sync -y
194- dnf install -y rpmdevtools rpm-sign 'dnf-command(builddep)'
195- dnf builddep -y fedora/surface-secureboot.spec
196-
197- - name : Build package
198- run : |
199- cd fedora
200-
201- # Build the .rpm packages
202- ./makerpm
203-
204- - name : Sign packages
205- env :
206- GPG_KEY : ${{ secrets.SURFACE_GPG_KEY }}
207- run : |
208- cd fedora/out/noarch
209-
210- # import GPG key
211- echo "$GPG_KEY" | base64 -d | gpg --import --no-tty --batch --yes
212-
213- # sign packages
214- rpm --resign *.rpm --define "_gpg_name $GPG_KEY_ID"
215-
216- - name : Upload artifacts
217- uses : actions/upload-artifact@v1
218- with :
219- name : fedora-32-latest
220- path : fedora/out/noarch
221-
222183 release :
223184 name : Publish release
224- needs : [build-deb, build-arch, build-f34, build-f33, build-f32 ]
185+ needs : [build-deb, build-arch, build-f34, build-f33]
225186 runs-on : ubuntu-latest
226187 steps :
227188 - name : Download Debian artifacts
@@ -244,11 +205,6 @@ jobs:
244205 with :
245206 name : fedora-33-latest
246207
247- - name : Download Fedora 32 artifacts
248- uses : actions/download-artifact@v1
249- with :
250- name : fedora-32-latest
251-
252208 - name : Upload assets
253209 uses : svenstaro/upload-release-action@v1-release
254210 with :
@@ -457,53 +413,3 @@ jobs:
457413 git add .
458414 git commit -m "Update Fedora 33 secure-boot MOK"
459415 git push --set-upstream origin "${update_branch}"
460-
461- repo-f32 :
462- name : Update Fedora 32 package repository
463- needs : [release]
464- runs-on : ubuntu-latest
465- container : fedora:32
466- steps :
467- - name : Install dependencies
468- run : |
469- dnf install -y git findutils
470-
471- - name : Download artifacts
472- uses : actions/download-artifact@v1
473- with :
474- name : fedora-32-latest
475-
476- - name : Update repository
477- env :
478- SURFACEBOT_TOKEN : ${{ secrets.GITHUB_BOT_TOKEN }}
479- BRANCH_STAGING : u/staging
480- GIT_REF : ${{ github.ref }}
481- run : |
482- repo="https://surfacebot:${SURFACEBOT_TOKEN}@github.com/linux-surface/repo.git"
483-
484- # clone package repository
485- git clone -b "${BRANCH_STAGING}" "${repo}" repo
486-
487- # copy packages
488- cp fedora-32-latest/* repo/fedora/f32
489- cd repo/fedora/f32
490-
491- # parse git tag from ref
492- GIT_TAG=$(echo $GIT_REF | sed 's|^refs/tags/||g')
493-
494- # convert packages into references
495- for pkg in $(find . -name '*.rpm'); do
496- echo "secureboot-mok:$GIT_TAG/$(basename $pkg)" > $pkg.blob
497- rm $pkg
498- done
499-
500- # set git identity
501- git config --global user.email "surfacebot@users.noreply.github.com"
502- git config --global user.name "surfacebot"
503-
504- # commit and push
505- update_branch="${BRANCH_STAGING}-$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
506- git checkout -b "${update_branch}"
507- git add .
508- git commit -m "Update Fedora 32 secure-boot MOK"
509- git push --set-upstream origin "${update_branch}"
0 commit comments