Skip to content

Commit 3a1ba38

Browse files
Jerboa-appJerboa-app
committed
rename
1 parent 7a49e22 commit 3a1ba38

File tree

5 files changed

+58
-58
lines changed

5 files changed

+58
-58
lines changed

‎.github/workflows/android.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Hop android tests
1+
name: Hop android
22

33
on:
44
pull_request:
@@ -49,7 +49,7 @@ jobs:
4949
include/vendored/sparsehash;
5050
do cp -r $inc headers; done
5151
52-
- name: Install dependencies
52+
- name: install dependencies
5353
run: |
5454
sudo apt-get update && sudo apt-get install -y build-essential mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev vulkan-tools libvulkan-dev vulkan-validationlayers-dev spirv-tools
5555
wget https://dl.google.com/android/repository/android-ndk-r25c-linux.zip
@@ -66,7 +66,7 @@ jobs:
6666
./cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-34"
6767
echo no | ./cmdline-tools/latest/bin/avdmanager create avd --name android34 --package "system-images;android-34;google_apis;x86_64"
6868
69-
- name: build hop
69+
- name: build
7070
run: |
7171
./build.sh -r --android android-ndk-r25c
7272

‎.github/workflows/linux.yml

+16-16
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
with:
1515
submodules: 'recursive'
1616

17-
- name: Install dependencies
17+
- name: install dependencies
1818
run: sudo apt-get update && sudo apt-get install -y build-essential xorg-dev mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev libxinerama-dev libxcursor-dev vulkan-tools libvulkan-dev vulkan-validationlayers-dev spirv-tools
1919

2020
- name: pack headers
@@ -53,10 +53,10 @@ jobs:
5353
include/vendored/sparsehash;
5454
do cp -r $inc headers; done
5555
56-
- name: linux-linux
56+
- name: build
5757
run: ./build.sh -t -d -r
5858

59-
- name: Tests
59+
- name: unit tests
6060
working-directory: ${{github.workspace}}/build
6161
# Execute tests defined by the CMake configuration.
6262
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
@@ -66,6 +66,15 @@ jobs:
6666
sleep 5
6767
MESA_GL_VERSION_OVERRIDE=3.3 ctest --output-on-failure --verbose
6868
69+
- name: regression
70+
run: |
71+
mkdir tests/regression/user/include/
72+
cp build/*.a tests/regression/user/
73+
cp -r headers/* tests/regression/user/include/
74+
cd tests/regression/user
75+
mkdir build && cd build
76+
cmake .. && make
77+
6978
linuxBuildAndRun:
7079
runs-on: ubuntu-22.04
7180

@@ -78,10 +87,10 @@ jobs:
7887
with:
7988
submodules: 'recursive'
8089

81-
- name: Install dependencies
90+
- name: install dependencies
8291
run: sudo apt-get update && sudo apt-get install -y build-essential xorg-dev mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev libxinerama-dev libxcursor-dev xvfb x11-apps vulkan-tools libvulkan-dev vulkan-validationlayers-dev spirv-tools
8392

84-
- name: linux-linux
93+
- name: build
8594
run: |
8695
./build.sh -t -r -d
8796
@@ -98,17 +107,8 @@ jobs:
98107
xwd -root -silent | convert xwd:- png:screenshot.png
99108
sleep 5 && kill $PID
100109
101-
- name: upload artifact
110+
- name: upload screenshot
102111
uses: actions/upload-artifact@v4
103112
with:
104113
name: ${{ matrix.example }}.png
105-
path: build/${{ matrix.example }}/screenshot.png
106-
107-
- name: regression
108-
run: |
109-
mkdir tests/regression/user/include/
110-
cp build/*.a tests/regression/user/
111-
cp -r headers/* tests/regression/user/include/
112-
cd tests/regression/user
113-
mkdir build && cd build
114-
cmake .. && make
114+
path: build/${{ matrix.example }}/screenshot.png

‎.github/workflows/macos.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Hop macOS tests
1+
name: Hop macOS
22

33
on:
44
pull_request:
@@ -13,7 +13,7 @@ jobs:
1313
with:
1414
submodules: 'recursive'
1515

16-
- name: Install dependencies
16+
- name: install dependencies
1717
run: |
1818
wget https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.zip -O vulkan-sdk.zip
1919
unzip vulkan-sdk.zip
@@ -58,7 +58,7 @@ jobs:
5858
include/vendored/sparsehash;
5959
do cp -r $inc headers; done
6060
61-
- name: macos build
61+
- name: build
6262
run: |
6363
git submodule update --recursive
6464
./build.sh -o -d -r -t
@@ -71,7 +71,7 @@ jobs:
7171
cp -r build/PerlinWorld demos/
7272
cd demos && zip -r ../demos.zip * && cd ..
7373
74-
- name: Tests
74+
- name: unit tests
7575
working-directory: ${{github.workspace}}/build
7676
# Execute tests defined by the CMake configuration.
7777
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail

‎.github/workflows/release.yml

+18-19
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ on:
88
- 'doc/**'
99
- '.github/**'
1010
workflow_dispatch:
11-
pull_request:
1211

1312
jobs:
1413

@@ -89,10 +88,10 @@ jobs:
8988
with:
9089
submodules: 'recursive'
9190

92-
- name: Install dependencies
91+
- name: install dependencies
9392
run: sudo apt-get update && sudo apt-get install -y build-essential xorg-dev mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev libxinerama-dev libxcursor-dev vulkan-tools libvulkan-dev vulkan-validationlayers-dev spirv-tools
9493

95-
- name: linux-linux
94+
- name: build
9695
run: |
9796
git submodule update --recursive
9897
./build.sh -t -d -r
@@ -105,7 +104,7 @@ jobs:
105104
cp -r build/PerlinWorld demos/
106105
cd demos && zip -r ../demos.zip * && cd ..
107106
108-
- name: Tests
107+
- name: unit tests
109108
working-directory: ${{github.workspace}}/build
110109
# Execute tests defined by the CMake configuration.
111110
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
@@ -135,10 +134,10 @@ jobs:
135134
with:
136135
submodules: 'recursive'
137136

138-
- name: Install dependencies
137+
- name: install dependencies
139138
run: sudo apt-get update && sudo apt-get install -y xorg-dev build-essential mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev g++-mingw-w64-x86-64-posix gcc-mingw-w64-x86-64-posix libxinerama-dev libxcursor-dev vulkan-tools libvulkan-dev vulkan-validationlayers-dev spirv-tools wine64
140139

141-
- name: linux-X-windows
140+
- name: build
142141
run: |
143142
git submodule update --recursive
144143
./build.sh -w -d -r -t
@@ -154,7 +153,7 @@ jobs:
154153
cd demos && zip -r ../demos.zip * && cd ..
155154
cp build/*.dll build/TestScriptPack/
156155
157-
- name: Tests (wine64)
156+
- name: unit tests
158157
working-directory: ${{github.workspace}}/build
159158
# Execute tests defined by the CMake configuration.
160159
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
@@ -185,7 +184,7 @@ jobs:
185184
with:
186185
submodules: 'recursive'
187186

188-
- name: Install dependencies
187+
- name: install dependencies
189188
run: |
190189
wget https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.zip -O vulkan-sdk.zip
191190
unzip vulkan-sdk.zip
@@ -194,7 +193,7 @@ jobs:
194193
cd ~/vulkan/
195194
python install_vulkan.py
196195
197-
- name: macos build
196+
- name: build
198197
run: |
199198
git submodule update --recursive
200199
./build.sh -o -d -r -t
@@ -207,7 +206,7 @@ jobs:
207206
cp -r build/PerlinWorld demos/
208207
cd demos && zip -r ../demos.zip * && cd ..
209208
210-
- name: Tests
209+
- name: unit tests
211210
working-directory: ${{github.workspace}}/build
212211
# Execute tests defined by the CMake configuration.
213212
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
@@ -230,7 +229,7 @@ jobs:
230229
runs-on: ubuntu-20.04
231230

232231
steps:
233-
- name: Install dependencies
232+
- name: install dependencies
234233
run: sudo apt-get update && sudo apt-get install -y xvfb x11-apps imagemagick
235234

236235
- name: get linux demos
@@ -278,7 +277,7 @@ jobs:
278277
with:
279278
submodules: 'recursive'
280279

281-
- name: Install dependencies
280+
- name: install dependencies
282281
run: |
283282
sudo apt-get update && sudo apt-get install -y build-essential mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev vulkan-tools libvulkan-dev vulkan-validationlayers-dev spirv-tools
284283
wget https://dl.google.com/android/repository/android-ndk-r25c-linux.zip
@@ -295,7 +294,7 @@ jobs:
295294
./cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-34"
296295
echo no | ./cmdline-tools/latest/bin/avdmanager create avd --name android34 --package "system-images;android-34;google_apis;x86_64"
297296
298-
- name: build hop
297+
- name: build
299298
run: |
300299
git submodule update --recursive
301300
./build.sh -r --android android-ndk-r25c
@@ -371,10 +370,10 @@ jobs:
371370
with:
372371
name: linuxbuild
373372

374-
- name: Install dependencies
373+
- name: install dependencies
375374
run: sudo apt-get update && sudo apt-get install -y xorg-dev build-essential mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev g++-mingw-w64-x86-64-posix gcc-mingw-w64-x86-64-posix libxinerama-dev libxcursor-dev vulkan-tools libvulkan-dev vulkan-validationlayers-dev spirv-tools xvfb x11-apps imagemagick
376375

377-
- name: linux lib test
376+
- name: regression
378377
run: |
379378
ls
380379
mv libHop-linux-x86_64.a libHop.a
@@ -407,10 +406,10 @@ jobs:
407406
with:
408407
name: windowsbuild
409408

410-
- name: Install dependencies
409+
- name: install dependencies
411410
run: sudo apt-get update && sudo apt-get install -y xorg-dev build-essential mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev g++-mingw-w64-x86-64-posix gcc-mingw-w64-x86-64-posix libz-mingw-w64-dev libxinerama-dev libxcursor-dev vulkan-tools libvulkan-dev vulkan-validationlayers-dev spirv-tools xvfb x11-apps imagemagick
412411

413-
- name: mingw lib test
412+
- name: regression
414413
run: |
415414
ls
416415
mv libHop-windows.a libHop.a
@@ -441,7 +440,7 @@ jobs:
441440
with:
442441
name: macosbuild
443442

444-
- name: Install dependencies
443+
- name: install dependencies
445444
run: |
446445
wget https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.zip -O vulkan-sdk.zip
447446
unzip vulkan-sdk.zip
@@ -450,7 +449,7 @@ jobs:
450449
cd ~/vulkan/
451450
python install_vulkan.py
452451
453-
- name: macos lib test
452+
- name: regression
454453
run: |
455454
ls
456455
mv libHop-macos.a libHop.a

‎.github/workflows/windows.yml

+17-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Hop wine tests
1+
name: Hop windows
22

33
on:
44
pull_request:
@@ -58,13 +58,13 @@ jobs:
5858
cp -r include/jGL/include/vendored/VulkanSDK/Include headers-mingw/VulkanSDK/
5959
cp -r include/jGL/include/vendored/VulkanSDK/Windows headers-mingw/VulkanSDK/
6060
61-
- name: Install dependencies
61+
- name: install dependencies
6262
run: sudo apt-get update && sudo apt-get install -y xorg-dev build-essential mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev g++-mingw-w64-x86-64-posix gcc-mingw-w64-x86-64-posix libxinerama-dev libxcursor-dev vulkan-tools libvulkan-dev vulkan-validationlayers-dev spirv-tools wine64
6363

64-
- name: linux-X-windows
64+
- name: build
6565
run: ./build.sh -w -d -r -t
6666

67-
- name: Tests (wine64)
67+
- name: unit tests
6868
working-directory: ${{github.workspace}}/build
6969
# Execute tests defined by the CMake configuration.
7070
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
@@ -75,6 +75,14 @@ jobs:
7575
sleep 5
7676
MESA_GL_VERSION_OVERRIDE=3.3 ctest --output-on-failure --verbose --exclude-regex Vulkan
7777
78+
- name: regression
79+
run: |
80+
mkdir tests/regression/user-mingw/include/
81+
cp build/*.a tests/regression/user-mingw/
82+
cp -r headers-mingw/* tests/regression/user-mingw/include/
83+
cd tests/regression/user-mingw
84+
./build.sh
85+
7886
wineBuildAndRun:
7987
if: ${{ github.event_name == 'workflow_dispatch' }}
8088
runs-on: ubuntu-22.04
@@ -88,9 +96,10 @@ jobs:
8896
with:
8997
submodules: 'recursive'
9098

91-
- name: Install dependencies
99+
- name: install dependencies
92100
run: sudo apt-get update && sudo apt-get install -y xorg-dev build-essential mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev g++-mingw-w64-x86-64-posix gcc-mingw-w64-x86-64-posix libxinerama-dev libxcursor-dev xvfb x11-apps vulkan-tools libvulkan-dev vulkan-validationlayers-dev spirv-tools wine64
93-
- name: linux-windows
101+
102+
- name: build
94103
run: |
95104
./build.sh -r -w -d
96105
@@ -107,16 +116,8 @@ jobs:
107116
xwd -root -silent | convert xwd:- png:screenshot.png
108117
sleep 5 && kill $PID
109118
110-
- name: upload artifact
119+
- name: upload screenshots
111120
uses: actions/upload-artifact@v4
112121
with:
113122
name: ${{ matrix.example }}-wine.png
114-
path: build/${{ matrix.example }}/screenshot.png
115-
116-
- name: regression
117-
run: |
118-
mkdir tests/regression/user-mingw/include/
119-
cp build/*.a tests/regression/user-mingw/
120-
cp -r headers-mingw/* tests/regression/user-mingw/include/
121-
cd tests/regression/user-mingw
122-
./build.sh
123+
path: build/${{ matrix.example }}/screenshot.png

0 commit comments

Comments
 (0)