@@ -202,54 +202,11 @@ jobs:
202202 name : fedora-32-latest
203203 path : pkg/fedora/out/x86_64
204204
205- build-f31 :
206- if : github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')
207-
208- name : Build Fedora 31 package
209- runs-on : ubuntu-latest
210- needs : [lint, test]
211- container : fedora:31
212-
213- steps :
214- - name : Checkout code
215- uses : actions/checkout@v2
216-
217- - name : Install build dependencies
218- run : |
219- dnf distro-sync -y
220- dnf install -y rpmdevtools rpm-sign 'dnf-command(builddep)'
221- dnf builddep -y pkg/fedora/surface-control.spec
222-
223- - name : Build package
224- run : |
225- cd pkg/fedora
226- # Build the .rpm packages
227- ./makerpm
228-
229- - name : Sign packages
230- env :
231- GPG_KEY_ID : 56C464BAAC421453
232- GPG_KEY : ${{ secrets.SURFACE_GPG_KEY }}
233- run : |
234- cd pkg/fedora/out/x86_64
235-
236- # import GPG key
237- echo "$GPG_KEY" | base64 -d | gpg --import --no-tty --batch --yes
238-
239- # sign package
240- rpm --resign *.rpm --define "_gpg_name $GPG_KEY_ID"
241-
242- - name : Upload artifacts
243- uses : actions/upload-artifact@v1
244- with :
245- name : fedora-31-latest
246- path : pkg/fedora/out/x86_64
247-
248205 release :
249206 if : github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')
250207
251208 name : Publish release
252- needs : [build-bin, build-deb, build-f33, build-f32, build-f31 ]
209+ needs : [build-bin, build-deb, build-f33, build-f32]
253210 runs-on : ubuntu-latest
254211
255212 steps :
@@ -273,11 +230,6 @@ jobs:
273230 with :
274231 name : fedora-32-latest
275232
276- - name : Download Fedora 31 artifacts
277- uses : actions/download-artifact@v1
278- with :
279- name : fedora-31-latest
280-
281233 - name : Upload assets
282234 uses : svenstaro/upload-release-action@v1-release
283235 with :
@@ -438,52 +390,3 @@ jobs:
438390 git commit -m "Update Fedora 32 surface-control"
439391 git push --set-upstream origin "${update_branch}"
440392
441- repo-f31 :
442- name : Update Fedora 31 package repository
443- needs : [release]
444- runs-on : ubuntu-latest
445- container : fedora:31
446- steps :
447- - name : Install dependencies
448- run : |
449- dnf install -y git findutils
450-
451- - name : Download artifacts
452- uses : actions/download-artifact@v1
453- with :
454- name : fedora-31-latest
455-
456- - name : Update repository
457- env :
458- SURFACEBOT_TOKEN : ${{ secrets.GITHUB_BOT_TOKEN }}
459- BRANCH_STAGING : u/staging
460- GIT_REF : ${{ github.ref }}
461- run : |
462- repo="https://surfacebot:${SURFACEBOT_TOKEN}@github.com/linux-surface/repo.git"
463-
464- # clone package repository
465- git clone -b "${BRANCH_STAGING}" "${repo}" repo
466-
467- # copy packages
468- cp fedora-31-latest/* repo/fedora/f31
469- cd repo/fedora/f31
470-
471- # parse git tag from ref
472- GIT_TAG=$(echo $GIT_REF | sed 's|^refs/tags/||g')
473-
474- # convert packages into references
475- for pkg in $(find . -name '*.rpm'); do
476- echo "surface-control:$GIT_TAG/$(basename $pkg)" > $pkg.blob
477- rm $pkg
478- done
479-
480- # set git identity
481- git config --global user.email "[email protected] " 482- git config --global user.name "surfacebot"
483-
484- # commit and push
485- update_branch="${BRANCH_STAGING}-$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
486- git checkout -b "${update_branch}"
487- git add .
488- git commit -m "Update Fedora 31 surface-control"
489- git push --set-upstream origin "${update_branch}"
0 commit comments