Skip to content

Commit f721fd5

Browse files
committed
Fedora 31 is EOL
Signed-off-by: Dorian Stoll <[email protected]>
1 parent 63b70ea commit f721fd5

File tree

1 file changed

+1
-111
lines changed

1 file changed

+1
-111
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -165,65 +165,9 @@ jobs:
165165
name: fedora-32-latest
166166
path: pkg/fedora/release
167167

168-
build-f31:
169-
name: Build Fedora 31 package
170-
runs-on: ubuntu-latest
171-
container: fedora:31
172-
steps:
173-
- name: Checkout code
174-
uses: actions/checkout@v2
175-
176-
- name: Install build dependencies
177-
run: |
178-
dnf distro-sync -y
179-
dnf install -y rpmdevtools rpm-sign 'dnf-command(builddep)'
180-
dnf builddep -y pkg/fedora/libwacom-surface.spec
181-
182-
- name: Build package
183-
run: |
184-
cd pkg/fedora
185-
186-
# Build the .rpm packages
187-
./makerpm
188-
189-
- name: Sign packages
190-
env:
191-
GPG_KEY_ID: 56C464BAAC421453
192-
GPG_KEY: ${{ secrets.SURFACE_GPG_KEY }}
193-
run: |
194-
cd pkg/fedora/out
195-
196-
# import GPG key
197-
echo "$GPG_KEY" | base64 -d | gpg --import --no-tty --batch --yes
198-
199-
# sign package
200-
cd noarch
201-
rpm --resign *.rpm --define "_gpg_name $GPG_KEY_ID"
202-
203-
cd ..
204-
205-
cd x86_64
206-
rpm --resign *.rpm --define "_gpg_name $GPG_KEY_ID"
207-
208-
- name: Prepare artifacts
209-
run: |
210-
cd pkg/fedora
211-
mkdir release
212-
213-
cp out/noarch/* release/
214-
cp out/x86_64/* release/
215-
216-
rm release/libwacom-surface-devel-*
217-
218-
- name: Upload artifacts
219-
uses: actions/upload-artifact@v1
220-
with:
221-
name: fedora-31-latest
222-
path: pkg/fedora/release
223-
224168
release:
225169
name: Publish release
226-
needs: [build-deb, build-f33, build-f32, build-f31]
170+
needs: [build-deb, build-f33, build-f32]
227171
runs-on: ubuntu-latest
228172
steps:
229173
- name: Download Debian artifacts
@@ -241,11 +185,6 @@ jobs:
241185
with:
242186
name: fedora-32-latest
243187

244-
- name: Download Fedora 31 artifacts
245-
uses: actions/download-artifact@v1
246-
with:
247-
name: fedora-31-latest
248-
249188
- name: Upload assets
250189
uses: svenstaro/upload-release-action@v1-release
251190
with:
@@ -406,52 +345,3 @@ jobs:
406345
git commit -m "Update Fedora 32 libwacom"
407346
git push --set-upstream origin "${update_branch}"
408347
409-
repo-f31:
410-
name: Update Fedora 31 package repository
411-
needs: [release]
412-
runs-on: ubuntu-latest
413-
container: fedora:31
414-
steps:
415-
- name: Install dependencies
416-
run: |
417-
dnf install -y git findutils
418-
419-
- name: Download artifacts
420-
uses: actions/download-artifact@v1
421-
with:
422-
name: fedora-31-latest
423-
424-
- name: Update repository
425-
env:
426-
SURFACEBOT_TOKEN: ${{ secrets.GITHUB_BOT_TOKEN }}
427-
BRANCH_STAGING: u/staging
428-
GIT_REF: ${{ github.ref }}
429-
run: |
430-
repo="https://surfacebot:${SURFACEBOT_TOKEN}@github.com/linux-surface/repo.git"
431-
432-
# clone package repository
433-
git clone -b "${BRANCH_STAGING}" "${repo}" repo
434-
435-
# copy packages
436-
cp fedora-31-latest/* repo/fedora/f31
437-
cd repo/fedora/f31
438-
439-
# parse git tag from ref
440-
GIT_TAG=$(echo $GIT_REF | sed 's|^refs/tags/||g')
441-
442-
# convert packages into references
443-
for pkg in $(find . -name '*.rpm'); do
444-
echo "libwacom-surface:$GIT_TAG/$(basename $pkg)" > $pkg.blob
445-
rm $pkg
446-
done
447-
448-
# set git identity
449-
git config --global user.email "[email protected]"
450-
git config --global user.name "surfacebot"
451-
452-
# commit and push
453-
update_branch="${BRANCH_STAGING}-$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
454-
git checkout -b "${update_branch}"
455-
git add .
456-
git commit -m "Update Fedora 31 libwacom"
457-
git push --set-upstream origin "${update_branch}"

0 commit comments

Comments
 (0)