Skip to content

Commit 94b56be

Browse files
committed
testing builds
1 parent 03958b5 commit 94b56be

2 files changed

Lines changed: 8 additions & 138 deletions

File tree

.github/workflows/build-pr.yml

Lines changed: 6 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -8,145 +8,13 @@ concurrency:
88
cancel-in-progress: true
99

1010
env:
11-
UPX_VERSION: 4.2.4
11+
CCACHE_VERSION: 4.10.2
1212

1313
jobs:
14-
15-
windows:
16-
runs-on: windows-latest
17-
steps:
18-
- uses: actions/checkout@v4
19-
20-
- name: Initial compile
21-
shell: cmd
22-
run: |
23-
"C:/Program Files/Microsoft Visual Studio/2022/Enterprise/MSBuild/Current/Bin/MSBuild.exe" WickedEngine.sln /t:OfflineShaderCompiler /m /p:Configuration=Release /p:Platform=x64
24-
25-
- name: Generate shader dump
26-
shell: cmd
27-
run: |
28-
cd "WickedEngine"
29-
"../BUILD/x64/Release/OfflineShaderCompiler/OfflineShaderCompiler.exe" hlsl6 spirv shaderdump strip_reflection
30-
31-
- name: Recompile with shader dump
32-
shell: cmd
33-
run: |
34-
"C:/Program Files/Microsoft Visual Studio/2022/Enterprise/MSBuild/Current/Bin/MSBuild.exe" WickedEngine.sln /t:clean /m /p:Configuration=Release /p:Platform=x64
35-
"C:/Program Files/Microsoft Visual Studio/2022/Enterprise/MSBuild/Current/Bin/MSBuild.exe" WickedEngine.sln /t:Editor_Windows /m /p:Configuration=Release /p:Platform=x64
36-
37-
- name: Move files
38-
shell: cmd
39-
run: |
40-
move BUILD\x64\Release\Editor_Windows\Editor_Windows.exe .\
41-
move Editor\config.ini .\
42-
move Editor\startup.lua .\
43-
move Editor\languages .\
44-
move Editor\fonts .\
45-
46-
- name: Install official UPX
47-
shell: cmd
48-
run: |
49-
curl -sOSL https://github.com/upx/upx/releases/download/v%UPX_VERSION%/upx-%UPX_VERSION%-win64.zip
50-
unzip -qj upx-%UPX_VERSION%-win64.zip upx-%UPX_VERSION%-win64/upx.exe
51-
52-
- name: Compress Editor with UPX
53-
shell: cmd
54-
run: upx --best Editor_Windows.exe
55-
56-
- name: Package Editor
57-
uses: actions/upload-artifact@v4
58-
with:
59-
name: Editor (Windows)
60-
path: |
61-
languages/
62-
fonts/
63-
config.ini
64-
startup.lua
65-
Editor_Windows.exe
66-
67-
68-
linux:
69-
runs-on: ubuntu-latest
70-
steps:
71-
- uses: actions/checkout@v4
72-
73-
- name: Restore CCache database
74-
id: restore-ccache
75-
uses: actions/cache/restore@v4
76-
with:
77-
path: ~/.cache/ccache
78-
key: ccache-${{ github.run_id }}
79-
restore-keys: ccache
80-
81-
- name: Install dependencies
82-
run: |
83-
sudo apt update
84-
sudo apt install libsdl2-dev ccache
85-
86-
- name: Initial compile
87-
run: |
88-
mkdir build
89-
cd build
90-
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
91-
CCACHE_NODIRECT=1 make -j$(nproc)
92-
93-
- name: Generate shader dump
94-
run: |
95-
cd build/WickedEngine
96-
./offlineshadercompiler spirv rebuild shaderdump
97-
mv wiShaderDump.h ../../WickedEngine/
98-
99-
- name: Recompile with shader dump
100-
run: |
101-
cd build
102-
CCACHE_NODIRECT=1 make -B -j $(nproc)
103-
104-
- name: Save Ccache database
105-
id: save-ccache
106-
if: always() && steps.restore-ccache.cache-hit != 'true'
107-
uses: actions/cache/save@v4
108-
with:
109-
path: ~/.cache/ccache
110-
key: ${{ steps.restore-ccache.outputs.cache-primary-key }}
111-
112-
- name: Move binaries
113-
run: |
114-
mv build/Editor/WickedEngineEditor ./Editor_Linux
115-
mv Editor/config.ini ./
116-
mv Editor/startup.lua ./
117-
mv Editor/languages ./
118-
mv Editor/fonts ./
119-
120-
- name: Install official UPX
121-
run: |
122-
curl -sOSL https://github.com/upx/upx/releases/download/v$UPX_VERSION/upx-$UPX_VERSION-amd64_linux.tar.xz
123-
tar xf upx-$UPX_VERSION-amd64_linux.tar.xz upx-$UPX_VERSION-amd64_linux/upx
124-
125-
- name: Compress Editor with UPX
126-
run: upx-$UPX_VERSION-amd64_linux/upx --best Editor_Linux
127-
128-
- name: Package Editor
129-
uses: actions/upload-artifact@v4
130-
with:
131-
name: Editor (Linux)
132-
path: |
133-
languages/
134-
fonts/
135-
config.ini
136-
startup.lua
137-
Editor_Linux
138-
139-
140-
content:
14+
test:
14115
runs-on: windows-latest
14216
steps:
143-
- uses: actions/checkout@v4
144-
- name: Package Content
145-
uses: actions/upload-artifact@v4
146-
with:
147-
name: Content
148-
path: |
149-
Content/Documentation
150-
Content/models
151-
Content/scripts
152-
Content/terrain
17+
- run: |
18+
curl -sOSL https://github.com/ccache/ccache/releases/download/v$Env:CCACHE_VERSION/ccache-$Env:CCACHE_VERSION-windows-x86_64.zip
19+
unzip -qj ccache-$Env:CCACHE_VERSION-windows-x86_64.zip ccache.exe
20+
dir ccache.exe

Editor/config.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ physics = true
2020
grid_helper = true
2121
language = English
2222

23+
focus_mode = true
2324
[hotkeys]
2425
#Formatting CTRL+KEY, SHIFT+KEY, CTRL+SHIFT+KEY <- KEY means nothing just replace with an actual key
2526
#[The keys that have CTRL+SHIFT in them require those keys otherwise it wont work, case sensitive.]
@@ -139,3 +140,4 @@ options.width = 338.000000
139140
options.height = 500.000000
140141
components.width = 338.000000
141142
components.height = 500.000000
143+
entities.height = 300.000000

0 commit comments

Comments
 (0)