Skip to content

Commit d68e853

Browse files
committed
add libevdev to deps, update some used scripts to same version as in build-main-on-push
git-svn-id: https://svn.code.sf.net/p/vice-emu/code/trunk@45425 379a1393-f5fb-40a0-bcee-ef074d9b53f7
1 parent a32667a commit d68e853

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

.github/workflows/build-main-on-push.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ jobs:
216216
with:
217217
msystem: ${{ matrix.arch.msystem }}
218218
update: true
219+
# CAUTION: use same packages in make-release.yml
219220
install: >-
220221
autotools
221222
base-devel
@@ -249,6 +250,7 @@ jobs:
249250
with:
250251
msystem: ${{ matrix.arch.msystem }}
251252
update: true
253+
# CAUTION: use same packages in make-release.yml
252254
install: >-
253255
autotools
254256
base-devel
@@ -392,6 +394,7 @@ jobs:
392394
strategy:
393395
fail-fast: false
394396
matrix:
397+
# CAUTION: use same config/deps in make-release.yml
395398
ui: [ { name: 'GTK3',
396399
conf: '--enable-gtk3ui --with-pulse',
397400
deps: 'libevdev-dev libglew-dev libgtk-3-dev libpulse-dev' },
@@ -419,6 +422,7 @@ jobs:
419422

420423
- name: Install Dependencies
421424
shell: bash
425+
# CAUTION: use same packages in make-release.yml
422426
run: |
423427
sudo apt update
424428
sudo apt install -y autoconf \

.github/workflows/make-release.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
- name: Create Release
1919
id: create_release
20-
uses: actions/github-script@v6
20+
uses: actions/github-script@v7
2121
env:
2222
TAG_NAME: ${{ github.ref }}
2323
RELEASE_NAME: ${{ github.ref }}
@@ -78,7 +78,7 @@ jobs:
7878

7979
- name: Upload Release Tarball
8080
id: upload
81-
uses: actions/github-script@v6
81+
uses: actions/github-script@v7
8282
env:
8383
UPLOAD_URL: ${{ needs.create_release.outputs.upload_url }}
8484
ASSET_PATH: ${{ steps.build.outputs.tarball_path }}
@@ -213,6 +213,7 @@ jobs:
213213
with:
214214
msystem: ${{ matrix.arch.msystem }}
215215
update: true
216+
# CAUTION: use same packages as in build-main-on-push.yml
216217
install: >-
217218
autotools
218219
base-devel
@@ -246,6 +247,7 @@ jobs:
246247
with:
247248
msystem: ${{ matrix.arch.msystem }}
248249
update: true
250+
# CAUTION: use same packages as in build-main-on-push.yml
249251
install: >-
250252
autotools
251253
base-devel
@@ -302,7 +304,7 @@ jobs:
302304
303305
- name: Upload Zip
304306
id: upload-zip
305-
uses: actions/github-script@v6
307+
uses: actions/github-script@v7
306308
env:
307309
UPLOAD_URL: ${{ needs.create_release.outputs.upload_url }}
308310
ASSET_PATH: ${{ steps.build.outputs.zip_path }}
@@ -326,7 +328,7 @@ jobs:
326328
327329
- name: Upload 7Zip
328330
id: upload-7zip
329-
uses: actions/github-script@v6
331+
uses: actions/github-script@v7
330332
env:
331333
UPLOAD_URL: ${{ needs.create_release.outputs.upload_url }}
332334
ASSET_PATH: ${{ steps.build.outputs.seven_zip_path }}
@@ -355,9 +357,10 @@ jobs:
355357
strategy:
356358
fail-fast: false
357359
matrix:
360+
# CAUTION: use same config/deps as in build-main-on-push.yml
358361
ui: [ { name: 'GTK3',
359362
conf: '--enable-gtk3ui --with-pulse',
360-
deps: 'libglew-dev libgtk-3-dev libpulse-dev' },
363+
deps: 'libevdev-dev libglew-dev libgtk-3-dev libpulse-dev' },
361364
{ name: 'SDL2',
362365
conf: '--enable-sdl2ui --with-sdlsound --without-pulse',
363366
deps: 'libsdl2-dev libsdl2-image-dev' },
@@ -372,16 +375,17 @@ jobs:
372375
run: git config --global core.autocrlf input
373376

374377
- name: Checkout Source
375-
uses: actions/checkout@v3
378+
uses: actions/checkout@v4
376379

377380
- name: Download Documentation
378-
uses: actions/download-artifact@v3
381+
uses: actions/download-artifact@v4
379382
with:
380383
name: vice-pdf
381384
path: vice/doc/
382385

383386
- name: Install Dependencies
384387
shell: bash
388+
# CAUTION: use same packages as in build-main-on-push.yml
385389
run: |
386390
sudo apt update
387391
sudo apt install -y autoconf \
@@ -452,7 +456,7 @@ jobs:
452456

453457
- name: Upload Deb
454458
id: upload_deb
455-
uses: actions/github-script@v6
459+
uses: actions/github-script@v7
456460
env:
457461
UPLOAD_URL: ${{ needs.create_release.outputs.upload_url }}
458462
ASSET_PATH: ${{ steps.make_deb.outputs.deb_path }}
@@ -479,7 +483,7 @@ jobs:
479483
needs: [create_release, build]
480484
runs-on: ubuntu-latest
481485
steps:
482-
- uses: actions/github-script@v6
486+
- uses: actions/github-script@v7
483487
with:
484488
github-token: ${{secrets.GITHUB_TOKEN}}
485489
retries: 3

0 commit comments

Comments
 (0)