Skip to content

Commit 9c38a80

Browse files
committed
preparation for release
1 parent 9ee1003 commit 9c38a80

File tree

2 files changed

+25
-109
lines changed

2 files changed

+25
-109
lines changed

.github/workflows/build.yml

Lines changed: 23 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ jobs:
6565
name: 'tic80-windows-sdl-stub'
6666
path: build/bin/tic80*.exe
6767

68-
# === Windows SDLGPU ===
69-
windows-sdlgpu:
68+
# === Windows SDL2 PRO ===
69+
windows-sdl-pro:
7070
runs-on: windows-latest
7171

7272
steps:
@@ -79,58 +79,17 @@ jobs:
7979
shell: cmd
8080
run: |
8181
cd build
82-
cmake -G "Visual Studio 16 2019" -DBUILD_SDLGPU=On -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DBUILD_STUB=On ..
82+
cmake -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DBUILD_PRO=On ..
8383
cmake --build . --config %BUILD_TYPE% --parallel
8484
8585
- name: Deploy
8686
uses: actions/upload-artifact@v2
8787
with:
88-
name: 'tic80-windows-sdlgpu'
88+
name: 'tic80-windows-sdl-pro'
8989
path: build/bin/tic80.exe
9090

91-
# === Windows SDLGPU PRO ===
92-
windows-sdlgpu-pro:
93-
runs-on: windows-latest
94-
95-
steps:
96-
- uses: actions/checkout@v2
97-
with:
98-
submodules: recursive
99-
fetch-depth: 0
100-
101-
- name: Build
102-
shell: cmd
103-
run: |
104-
cd build
105-
cmake -G "Visual Studio 16 2019" -DBUILD_SDLGPU=On -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DBUILD_PRO=On ..
106-
cmake --build . --config %BUILD_TYPE% --parallel
107-
108-
# === Windows Sokol ===
109-
windows-sokol:
110-
runs-on: windows-latest
111-
112-
steps:
113-
- uses: actions/checkout@v2
114-
with:
115-
submodules: recursive
116-
fetch-depth: 0
117-
118-
- name: Build
119-
shell: cmd
120-
run: |
121-
cd build
122-
cmake -G "Visual Studio 16 2019" -DBUILD_SDL=Off -DBUILD_SOKOL=On -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..
123-
cmake --build . --config %BUILD_TYPE% --parallel
124-
cp bin/tic80-sokol.exe bin/tic80.exe
125-
126-
- name: Deploy
127-
uses: actions/upload-artifact@v2
128-
with:
129-
name: 'tic80-windows-sokol'
130-
path: build/bin/tic80.exe
131-
132-
# === Ubuntu SDLGPU ===
133-
linux-sdlgpu:
91+
# === Ubuntu SDL2 ===
92+
linux-sdl:
13493
runs-on: ubuntu-16.04
13594

13695
steps:
@@ -147,46 +106,30 @@ jobs:
147106
- name: Build
148107
run: |
149108
cd build
150-
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_SDLGPU=On -DBUILD_STUB=On ..
109+
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_STUB=On ..
151110
cmake --build . --config $BUILD_TYPE --parallel
152111
cpack
153112
154113
- name: Deploy DEB
155114
uses: actions/upload-artifact@v2
156115
with:
157-
name: 'tic80-linux-sdlgpu-deb'
116+
name: 'tic80-linux-sdl-deb'
158117
path: build/tic80.deb
159118

160119
- name: Deploy ZIP
161120
uses: actions/upload-artifact@v2
162121
with:
163-
name: 'tic80-linux-sdlgpu'
122+
name: 'tic80-linux-sdl'
164123
path: build/bin/tic80
165124

166-
# === Ubuntu SDLGPU PRO ===
167-
linux-sdlgpu-pro:
168-
runs-on: ubuntu-16.04
169-
170-
steps:
171-
- uses: actions/checkout@v2
172-
with:
173-
submodules: recursive
174-
fetch-depth: 0
175-
176-
- name: Install
177-
run: |
178-
sudo apt-get update
179-
sudo apt-get install libglu1-mesa-dev libasound2-dev libpulse-dev libaudio-dev libsamplerate0-dev -y
180-
181-
- name: Build
182-
run: |
183-
cd build
184-
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_SDLGPU=On -DBUILD_PRO=On ..
185-
cmake --build . --config $BUILD_TYPE --parallel
186-
cpack
125+
- name: Deploy stubs
126+
uses: actions/upload-artifact@v2
127+
with:
128+
name: 'tic80-linux-sdl-stub'
129+
path: build/bin/tic80*
187130

188-
# === Ubuntu SDL2 ===
189-
linux-sdl:
131+
# === Ubuntu SDL2 PRO ===
132+
linux-sdl-pro:
190133
runs-on: ubuntu-16.04
191134

192135
steps:
@@ -203,28 +146,22 @@ jobs:
203146
- name: Build
204147
run: |
205148
cd build
206-
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_STUB=On ..
149+
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_PRO=On ..
207150
cmake --build . --config $BUILD_TYPE --parallel
208151
cpack
209152
210153
- name: Deploy DEB
211154
uses: actions/upload-artifact@v2
212155
with:
213-
name: 'tic80-linux-sdl-deb'
156+
name: 'tic80-linux-sdl-pro-deb'
214157
path: build/tic80.deb
215158

216159
- name: Deploy ZIP
217160
uses: actions/upload-artifact@v2
218161
with:
219-
name: 'tic80-linux-sdl'
162+
name: 'tic80-linux-sdl-pro'
220163
path: build/bin/tic80
221164

222-
- name: Deploy stubs
223-
uses: actions/upload-artifact@v2
224-
with:
225-
name: 'tic80-linux-sdl-stub'
226-
path: build/bin/tic80*
227-
228165
# === Raspberry PI ===
229166
rpi:
230167
runs-on: ubuntu-latest
@@ -373,8 +310,8 @@ jobs:
373310
name: 'tic80-macos-sdl-stub'
374311
path: build/bin/tic80*
375312

376-
# === MacOS 10.15 SDLGPU ===
377-
macos-sdlgpu:
313+
# === MacOS 10.15 SDL2 PRO ===
314+
macos-sdl-pro:
378315
runs-on: macos-10.15
379316

380317
steps:
@@ -389,38 +326,17 @@ jobs:
389326
- name: Build
390327
run: |
391328
cd build
392-
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_SDLGPU=On -DBUILD_STUB=On ..
329+
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_PRO=On ..
393330
cmake --build . --config $BUILD_TYPE --parallel
394331
cpack
395332
cp *.dmg tic80.dmg
396333
397334
- name: Deploy DMG
398335
uses: actions/upload-artifact@v2
399336
with:
400-
name: 'tic80-macos-sdlgpu-dmg'
337+
name: 'tic80-macos-sdl-pro-dmg'
401338
path: build/tic80.dmg
402339

403-
# === MacOS 10.15 SDLGPU PRO ===
404-
macos-sdlgpu-pro:
405-
runs-on: macos-10.15
406-
407-
steps:
408-
- uses: actions/checkout@v2
409-
with:
410-
submodules: recursive
411-
fetch-depth: 0
412-
413-
- name: Install
414-
run: brew uninstall --ignore-dependencies libidn2
415-
416-
- name: Build
417-
run: |
418-
cd build
419-
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_SDLGPU=On -DBUILD_PRO=On ..
420-
cmake --build . --config $BUILD_TYPE --parallel
421-
cpack
422-
cp *.dmg tic80.dmg
423-
424340
# === Android ===
425341
android:
426342
runs-on: ubuntu-latest

build/android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ android {
1515
}
1616
minSdkVersion 16
1717
targetSdkVersion 29
18-
versionCode 9000
19-
versionName "0.90.00"
18+
versionCode 9021
19+
versionName "0.90.21"
2020
externalNativeBuild {
2121
ndkBuild {
2222
arguments "APP_PLATFORM=android-16"

0 commit comments

Comments
 (0)