Skip to content

Commit 69017ae

Browse files
authored
#114 - Update Actions, make DLL list more flexible. (#115)
* Make DLL list more flexible, update actions. * Revert to windblows 2019 because 2022 breaks the msys build
1 parent 545e5c3 commit 69017ae

File tree

3 files changed

+64
-64
lines changed

3 files changed

+64
-64
lines changed

.github/workflows/build.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@ jobs:
2323
steps:
2424
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
2525
- name: Checkout ${{ github.event.pull_request.head.ref }}
26-
uses: actions/checkout@v2.2.0
26+
uses: actions/checkout@v2.5.0
2727
if: ${{ github.event.pull_request }}
2828
with:
2929
repository: ${{ github.repository }}
3030
ref: ${{ github.event.pull_request.head.sha }}
3131
submodules: false
3232

3333
- name: Checkout ${{ github.event.ref }}
34-
uses: actions/checkout@v2.2.0
34+
uses: actions/checkout@v2.5.0
3535
if: ${{ !github.event.pull_request }}
3636
with:
3737
repository: ${{ github.repository }}
3838
ref: ${{ github.event.ref }}
3939
submodules: false
4040

4141
- name: Cache packages
42-
uses: actions/cache@v1.0.3
42+
uses: actions/cache@v3.0.11
4343
id: cache-pkgs
4444
with:
4545
path: "packages"
@@ -65,7 +65,7 @@ jobs:
6565
run: cd ${{ runner.workspace }}/MINI404 && make -j3
6666

6767
- name: Checkout Wiki
68-
uses: actions/checkout@v2.2.0
68+
uses: actions/checkout@v2.5.0
6969
if: ${{ !github.event.pull_request }}
7070
with:
7171
repository: vintagepc/MINI404.wiki.git
@@ -92,7 +92,7 @@ jobs:
9292
tar -jhcvf Mini404-dev-linux.tar.bz2 Mini404-dev-linux
9393
- name: Upload artifact
9494
if: ${{ !github.event.pull_request }}
95-
uses: actions/upload-artifact@v2
95+
uses: actions/upload-artifact@v3.1.1
9696
with:
9797
name: Binaries
9898
path: ${{ runner.workspace }}/MINI404/build/Mini404-dev-linux.tar.bz2
@@ -105,15 +105,15 @@ jobs:
105105
steps:
106106
# # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
107107
- name: Checkout ${{ github.event.pull_request.head.ref }}
108-
uses: actions/checkout@v2.2.0
108+
uses: actions/checkout@v2.5.0
109109
if: ${{ github.event.pull_request }}
110110
with:
111111
repository: ${{ github.repository }}
112112
ref: ${{ github.event.pull_request.head.sha }}
113113
submodules: true
114114

115115
- name: Checkout ${{ github.event.ref }}
116-
uses: actions/checkout@v2.2.0
116+
uses: actions/checkout@v2.5.0
117117
if: ${{ !github.event.pull_request }}
118118
with:
119119
repository: ${{ github.repository }}
@@ -140,14 +140,14 @@ jobs:
140140
141141
- name: Upload artifact
142142
if: ${{ !github.event.pull_request }}
143-
uses: actions/upload-artifact@v2
143+
uses: actions/upload-artifact@v3.1.1
144144
with:
145145
name: Binaries
146146
path: ${{ runner.workspace }}/MINI404/build/Mini404-dev-macos.tar.bz2
147147

148148
build_msys:
149149
# The type of runner that the job will run on
150-
runs-on: windows-latest
150+
runs-on: windows-2019
151151
if: "!contains(github.event.head_commit.message, 'NO_BUILD')"
152152
steps:
153153
- name: Install MSYS2
@@ -160,15 +160,15 @@ jobs:
160160
run: git config --global core.autocrlf false
161161

162162
- name: Checkout ${{ github.event.pull_request.head.ref }}
163-
uses: actions/checkout@v2.2.0
163+
uses: actions/checkout@v2.5.0
164164
if: ${{ github.event.pull_request }}
165165
with:
166166
repository: ${{ github.repository }}
167167
ref: ${{ github.event.pull_request.head.sha }}
168168
submodules: false
169169

170170
- name: Checkout ${{ github.event.ref }}
171-
uses: actions/checkout@v2.2.0
171+
uses: actions/checkout@v2.5.0
172172
if: ${{ !github.event.pull_request }}
173173
with:
174174
repository: ${{ github.repository }}
@@ -206,7 +206,7 @@ jobs:
206206

207207
- name: Upload Cygwin artifact
208208
if: ${{ !github.event.pull_request }}
209-
uses: actions/upload-artifact@v2
209+
uses: actions/upload-artifact@v3.1.1
210210
with:
211211
name: Binaries
212212
path: ${{ runner.workspace }}/MINI404/build/Mini404-dev-w64.zip
@@ -217,7 +217,7 @@ jobs:
217217
needs: [build_linux, build_msys, build_macos]
218218
steps:
219219
- name: Retrieve platform binaries
220-
uses: actions/download-artifact@v2
220+
uses: actions/download-artifact@v3.0.1
221221
with:
222222
name: Binaries
223223

.github/workflows/dll-list.txt

+48-48
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,63 @@
11
glew32.dll
2-
libatk-1.0-0.dll
2+
libatk-*.dll
33
libbrotlicommon.dll
44
libbrotlidec.dll
55
libbrotlienc.dll
6-
libbz2-1.dll
7-
libcairo-2.dll
6+
libbz2-*.dll
7+
libcairo-*.dll
88
libcairo-gobject-2.dll
9-
libcrypto-1_1-x64.dll
10-
libcurl-4.dll
9+
libcrypto-1*-x64.dll
10+
libcurl-*.dll
1111
libdatrie-1.dll
1212
libdeflate.dll
13-
libepoxy-0.dll
14-
libexpat-1.dll
15-
libffi-8.dll
16-
libfontconfig-1.dll
13+
libepoxy-*.dll
14+
libexpat-*.dll
15+
libffi-*.dll
16+
libfontconfig-*.dll
1717
libfreeglut.dll
18-
libfreetype-6.dll
19-
libfribidi-0.dll
20-
libgcc_s_seh-1.dll
21-
libgdk-3-0.dll
22-
libgdk_pixbuf-2.0-0.dll
23-
libgio-2.0-0.dll
24-
libglib-2.0-0.dll
25-
libgmodule-2.0-0.dll
26-
libgobject-2.0-0.dll
18+
libfreetype-*.dll
19+
libfribidi-*.dll
20+
libgcc_s_seh-*.dll
21+
libgdk-*.dll
22+
libgdk_pixbuf-*.dll
23+
libgio-*.dll
24+
libglib-*.dll
25+
libgmodule-*.dll
26+
libgobject-*.dll
2727
libgraphite2.dll
28-
libgtk-3-0.dll
29-
libharfbuzz-0.dll
30-
libharfbuzz-gobject-0.dll
31-
libharfbuzz-icu-0.dll
32-
libharfbuzz-subset-0.dll
33-
libiconv-2.dll
34-
libidn2-0.dll
35-
libintl-8.dll
36-
libjbig-0.dll
37-
libjpeg-8.dll
28+
libgtk-3-*.dll
29+
libharfbuzz-*.dll
30+
libharfbuzz-gobject-*.dll
31+
libharfbuzz-icu-*.dll
32+
libharfbuzz-subset-*.dll
33+
libiconv-*.dll
34+
libidn2-*.dll
35+
libintl-*.dll
36+
libjbig-*.dll
37+
libjpeg-*.dll
3838
libjxl.dll
3939
libLerc.dll
40-
liblzma-5.dll
41-
liblzo2-2.dll
42-
libncursesw6.dll
43-
libnghttp2-14.dll
44-
libpango-1.0-0.dll
45-
libpangocairo-1.0-0.dll
46-
libpangoft2-1.0-0.dll
47-
libpangowin32-1.0-0.dll
48-
libpcre-1.dll
49-
libpixman-1-0.dll
50-
libpng16-16.dll
51-
libpsl-5.dll
52-
libssh2-1.dll
53-
libssl-1_1-x64.dll
54-
libssp-0.dll
40+
liblzma-*.dll
41+
liblzo2-*.dll
42+
libncursesw*.dll
43+
libnghttp2-*.dll
44+
libpango-*.dll
45+
libpangocairo-*.dll
46+
libpangoft2-*.dll
47+
libpangowin32-*.dll
48+
libpcre-*.dll
49+
libpixman-*.dll
50+
libpng16-*.dll
51+
libpsl-*.dll
52+
libssh2-*.dll
53+
libssl-1_*-x64.dll
54+
libssp-*.dll
5555
libstdc++-6.dll
56-
libthai-0.dll
57-
libtiff-5.dll
58-
libunistring-2.dll
59-
libusb-1.0.dll
60-
libwebp-7.dll
56+
libthai-*.dll
57+
libtiff-*.dll
58+
libunistring-*.dll
59+
libusb-1.*.dll
60+
libwebp-*.dll
6161
libwinpthread-1.dll
6262
libzstd.dll
6363
SDL2.dll

.github/workflows/lint.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@ jobs:
2121
steps:
2222
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
2323
- name: Checkout ${{ github.event.pull_request.head.ref }}
24-
uses: actions/checkout@v2.2.0
24+
uses: actions/checkout@v2.5.0
2525
if: ${{ github.event.pull_request }}
2626
with:
2727
repository: vintagepc/MINI404.git
2828
ref: ${{ github.event.pull_request.head.sha }}
2929
submodules: false
3030

3131
- name: Checkout ${{ github.event.ref }}
32-
uses: actions/checkout@v2.2.0
32+
uses: actions/checkout@v2.5.0
3333
if: ${{ !github.event.pull_request }}
3434
with:
3535
repository: vintagepc/MINI404.git
3636
ref: ${{ github.event.ref }}
3737
submodules: false
3838

3939
- name: Cache packages
40-
uses: actions/cache@v1.0.3
40+
uses: actions/cache@v3.0.11
4141
id: cache-pkgs
4242
with:
4343
path: "packages"

0 commit comments

Comments
 (0)