@@ -209,54 +209,11 @@ jobs:
209209 name : fedora-33-latest
210210 path : pkg/fedora/out/x86_64
211211
212- build-f32 :
213- if : github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')
214-
215- name : Build Fedora 32 package
216- runs-on : ubuntu-latest
217- needs : [lint, test]
218- container : fedora:32
219-
220- steps :
221- - name : Checkout code
222- uses : actions/checkout@v2
223-
224- - name : Install build dependencies
225- run : |
226- dnf distro-sync -y
227- dnf install -y rpmdevtools rpm-sign 'dnf-command(builddep)'
228- dnf builddep -y pkg/fedora/surface-dtx-daemon.spec
229-
230- - name : Build package
231- run : |
232- cd pkg/fedora
233- # Build the .rpm packages
234- ./makerpm
235-
236- - name : Sign packages
237- env :
238- GPG_KEY_ID : 56C464BAAC421453
239- GPG_KEY : ${{ secrets.SURFACE_GPG_KEY }}
240- run : |
241- cd pkg/fedora/out/x86_64
242-
243- # import GPG key
244- echo "$GPG_KEY" | base64 -d | gpg --import --no-tty --batch --yes
245-
246- # sign package
247- rpm --resign *.rpm --define "_gpg_name $GPG_KEY_ID"
248-
249- - name : Upload artifacts
250- uses : actions/upload-artifact@v1
251- with :
252- name : fedora-32-latest
253- path : pkg/fedora/out/x86_64
254-
255212 release :
256213 if : github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')
257214
258215 name : Publish release
259- needs : [build-bin, build-deb, build-f34, build-f33, build-f32 ]
216+ needs : [build-bin, build-deb, build-f34, build-f33]
260217 runs-on : ubuntu-latest
261218
262219 steps :
@@ -280,11 +237,6 @@ jobs:
280237 with :
281238 name : fedora-33-latest
282239
283- - name : Download Fedora 32 artifacts
284- uses : actions/download-artifact@v1
285- with :
286- name : fedora-32-latest
287-
288240 - name : Upload assets
289241 uses : svenstaro/upload-release-action@v1-release
290242 with :
@@ -444,53 +396,3 @@ jobs:
444396 git add .
445397 git commit -m "Update Fedora 33 DTX daemon"
446398 git push --set-upstream origin "${update_branch}"
447-
448- repo-f32 :
449- name : Update Fedora 32 package repository
450- needs : [release]
451- runs-on : ubuntu-latest
452- container : fedora:32
453- steps :
454- - name : Install dependencies
455- run : |
456- dnf install -y git findutils
457-
458- - name : Download artifacts
459- uses : actions/download-artifact@v1
460- with :
461- name : fedora-32-latest
462-
463- - name : Update repository
464- env :
465- SURFACEBOT_TOKEN : ${{ secrets.GITHUB_BOT_TOKEN }}
466- BRANCH_STAGING : u/staging
467- GIT_REF : ${{ github.ref }}
468- run : |
469- repo="https://surfacebot:${SURFACEBOT_TOKEN}@github.com/linux-surface/repo.git"
470-
471- # clone package repository
472- git clone -b "${BRANCH_STAGING}" "${repo}" repo
473-
474- # copy packages
475- cp fedora-32-latest/* repo/fedora/f32
476- cd repo/fedora/f32
477-
478- # parse git tag from ref
479- GIT_TAG=$(echo $GIT_REF | sed 's|^refs/tags/||g')
480-
481- # convert packages into references
482- for pkg in $(find . -name '*.rpm'); do
483- echo "surface-dtx-daemon:$GIT_TAG/$(basename $pkg)" > $pkg.blob
484- rm $pkg
485- done
486-
487- # set git identity
488- git config --global user.email "[email protected] " 489- git config --global user.name "surfacebot"
490-
491- # commit and push
492- update_branch="${BRANCH_STAGING}-$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
493- git checkout -b "${update_branch}"
494- git add .
495- git commit -m "Update Fedora 32 DTX daemon"
496- git push --set-upstream origin "${update_branch}"
0 commit comments