Skip to content

Commit 40da50f

Browse files
Update build system to use Godot 3.6.2
* Amend workflows/run script to use new custom builder templates & custom image * c --------- Co-authored-by: Nathan Lovato <12694995+NathanLovato@users.noreply.github.com>
1 parent 1b0228f commit 40da50f

7 files changed

Lines changed: 180 additions & 80 deletions

File tree

.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
GODOT_VERSION=3.6.2
2+
TEMPLATES_REPO=Razoric480/custom-godot-builder

.github/workflows/ExportGodot.yaml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ on:
99
- staging
1010

1111
env:
12-
GODOT_VERSION: 3.4.4
1312
BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}
1413
ITCHIO_USERNAME: ${{ secrets.ITCHIO_USERNAME }}
1514
ITCHIO_GAME: ${{ secrets.ITCHIO_GAME }}
@@ -19,12 +18,16 @@ jobs:
1918
export-linux:
2019
name: Linux Export
2120
runs-on: ubuntu-latest
22-
container: barichello/godot-ci:3.4.4
21+
container: registry.gitlab.com/greenfox/godot-build-automation:latest
2322
steps:
2423
- name: Checkout
2524
uses: actions/checkout@v4
2625
with:
2726
lfs: true
27+
- name: Load .env file
28+
run: cat .env >> "$GITHUB_ENV"
29+
- name: Make run executable
30+
run: chmod +x run
2831
- run: ./run prepare:ci
2932
- run: ./run export:linux
3033
- run: ./run push:linux
@@ -45,12 +48,16 @@ jobs:
4548
export-win:
4649
name: Windows Export
4750
runs-on: ubuntu-latest
48-
container: barichello/godot-ci:3.4.4
51+
container: registry.gitlab.com/greenfox/godot-build-automation:latest
4952
steps:
5053
- name: Checkout
5154
uses: actions/checkout@v4
5255
with:
5356
lfs: true
57+
- name: Load .env file
58+
run: cat .env >> "$GITHUB_ENV"
59+
- name: Make run executable
60+
run: chmod +x run
5461
- run: ./run prepare:ci
5562
- run: ./run export:windows
5663
- run: ./run push:windows
@@ -71,12 +78,16 @@ jobs:
7178
export-osx:
7279
name: OSX Export
7380
runs-on: ubuntu-latest
74-
container: barichello/godot-ci:3.4.4
81+
container: registry.gitlab.com/greenfox/godot-build-automation:latest
7582
steps:
7683
- name: Checkout
7784
uses: actions/checkout@v4
7885
with:
7986
lfs: true
87+
- name: Load .env file
88+
run: cat .env >> "$GITHUB_ENV"
89+
- name: Make run executable
90+
run: chmod +x run
8091
- run: ./run prepare:ci
8192
- run: ./run export:osx
8293
- run: ./run push:osx
@@ -98,12 +109,16 @@ jobs:
98109
export-web:
99110
name: Web Export
100111
runs-on: ubuntu-latest
101-
container: barichello/godot-ci:3.4.4
112+
container: registry.gitlab.com/greenfox/godot-build-automation:latest
102113
steps:
103114
- name: Checkout
104115
uses: actions/checkout@v4
105116
with:
106117
lfs: true
118+
- name: Load .env file
119+
run: cat .env >> "$GITHUB_ENV"
120+
- name: Make run executable
121+
run: chmod +x run
107122
- run: ./run prepare:ci
108123
- run: ./run export:web
109124
- run: ./run push:web

export_presets.cfg

Lines changed: 75 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ platform="Linux/X11"
55
runnable=false
66
custom_features=""
77
export_filter="all_resources"
8-
include_filter=""
8+
include_filter="*.lgd"
99
exclude_filter=""
1010
export_path="build/linux/learn_to_code.x86_64"
1111
script_export_mode=1
1212
script_encryption_key=""
1313

1414
[preset.0.options]
1515

16-
custom_template/debug="templates/344custom-linux_x11_64_debug"
17-
custom_template/release="templates/344custom-linux_x11_64_release"
18-
binary_format/64_bits=true
16+
custom_template/debug="/templates/godot.x11.opt.64"
17+
custom_template/release="/templates/godot.x11.opt.64"
18+
binary_format/architecture="x86_64"
1919
binary_format/embed_pck=false
2020
texture_format/bptc=false
2121
texture_format/s3tc=true
@@ -30,21 +30,21 @@ platform="HTML5"
3030
runnable=true
3131
custom_features=""
3232
export_filter="all_resources"
33-
include_filter=""
33+
include_filter="*.lgd"
3434
exclude_filter=""
3535
export_path="build/web/index.html"
3636
script_export_mode=1
3737
script_encryption_key=""
3838

3939
[preset.1.options]
4040

41-
custom_template/debug="templates/344custom-webassembly_debug.zip"
42-
custom_template/release="templates/344custom-webassembly_release.zip"
41+
custom_template/debug="/templates/godot.javascript.opt.zip"
42+
custom_template/release="/templates/godot.javascript.opt.zip"
4343
variant/export_type=0
4444
vram_texture_compression/for_desktop=true
4545
vram_texture_compression/for_mobile=false
4646
html/export_icon=true
47-
html/custom_html_shell="res://html_export/index.html"
47+
html/custom_html_shell="res://html_export/index_template.html"
4848
html/head_include=""
4949
html/canvas_resize_policy=2
5050
html/focus_canvas_on_start=true
@@ -65,16 +65,16 @@ platform="Windows Desktop"
6565
runnable=true
6666
custom_features=""
6767
export_filter="all_resources"
68-
include_filter=""
68+
include_filter="*.lgd"
6969
exclude_filter=""
70-
export_path="build/2/index.exe"
70+
export_path="build/windows/learn_to_code.exe"
7171
script_export_mode=1
7272
script_encryption_key=""
7373

7474
[preset.2.options]
7575

76-
custom_template/debug="templates/344custom-windows_64_debug.exe"
77-
custom_template/release="templates/344custom-windows_64_release.exe"
76+
custom_template/debug="/templates/godot.windows.opt.64.exe"
77+
custom_template/release="/templates/godot.windows.opt.64.exe"
7878
binary_format/64_bits=true
7979
binary_format/embed_pck=false
8080
texture_format/bptc=false
@@ -83,14 +83,17 @@ texture_format/etc=false
8383
texture_format/etc2=false
8484
texture_format/no_bptc_fallbacks=true
8585
codesign/enable=false
86+
codesign/identity_type=0
8687
codesign/identity=""
8788
codesign/password=""
8889
codesign/timestamp=true
8990
codesign/timestamp_server_url=""
9091
codesign/digest_algorithm=1
9192
codesign/description=""
9293
codesign/custom_options=PoolStringArray( )
94+
application/modify_resources=true
9395
application/icon=""
96+
application/icon_interpolation=4
9497
application/file_version=""
9598
application/product_version=""
9699
application/company_name=""
@@ -106,28 +109,82 @@ platform="Mac OSX"
106109
runnable=true
107110
custom_features=""
108111
export_filter="all_resources"
109-
include_filter=""
112+
include_filter="*.lgd"
110113
exclude_filter=""
111-
export_path=""
114+
export_path="build/osx/learn_to_code.app"
112115
script_export_mode=1
113116
script_encryption_key=""
114117

115118
[preset.3.options]
116119

117-
custom_template/debug="templates/344custom-osx.zip"
118-
custom_template/release="templates/344custom-osx.zip"
120+
export/distribution_type=1
121+
custom_template/debug="/templates/osx_template.zip"
122+
custom_template/release="/templates/osx_template.zip"
119123
application/name="Learn To Code With Godot"
120-
application/info="Made with Godot Engine"
121124
application/icon=""
125+
application/icon_interpolation=4
122126
application/identifier="com.gdquest.learncode"
123127
application/signature=""
124128
application/app_category="Games"
125129
application/short_version="1.0"
126130
application/version="1.0"
127131
application/copyright=""
132+
application/min_macos_version="10.12"
128133
display/high_res=false
129-
privacy/camera_usage_description=""
134+
xcode/platform_build="14C18"
135+
xcode/sdk_version="13.1"
136+
xcode/sdk_build="22C55"
137+
xcode/sdk_name="macosx13.1"
138+
xcode/xcode_version="1420"
139+
xcode/xcode_build="14C18"
140+
codesign/codesign=1
141+
codesign/installer_identity=""
142+
codesign/apple_team_id=""
143+
codesign/identity=""
144+
codesign/certificate_file=""
145+
codesign/certificate_password=""
146+
codesign/provisioning_profile=""
147+
codesign/entitlements/custom_file=""
148+
codesign/entitlements/allow_jit_code_execution=false
149+
codesign/entitlements/allow_unsigned_executable_memory=false
150+
codesign/entitlements/allow_dyld_environment_variables=false
151+
codesign/entitlements/disable_library_validation=false
152+
codesign/entitlements/audio_input=false
153+
codesign/entitlements/camera=false
154+
codesign/entitlements/location=false
155+
codesign/entitlements/address_book=false
156+
codesign/entitlements/calendars=false
157+
codesign/entitlements/photos_library=false
158+
codesign/entitlements/apple_events=false
159+
codesign/entitlements/debugging=false
160+
codesign/entitlements/app_sandbox/enabled=false
161+
codesign/entitlements/app_sandbox/network_server=false
162+
codesign/entitlements/app_sandbox/network_client=false
163+
codesign/entitlements/app_sandbox/device_usb=false
164+
codesign/entitlements/app_sandbox/device_bluetooth=false
165+
codesign/entitlements/app_sandbox/files_downloads=0
166+
codesign/entitlements/app_sandbox/files_pictures=0
167+
codesign/entitlements/app_sandbox/files_music=0
168+
codesign/entitlements/app_sandbox/files_movies=0
169+
codesign/entitlements/app_sandbox/files_user_selected=0
170+
codesign/custom_options=PoolStringArray( )
171+
notarization/notarization=0
172+
notarization/apple_id_name=""
173+
notarization/apple_id_password=""
174+
notarization/api_uuid=""
175+
notarization/api_key=""
176+
notarization/api_key_id=""
130177
privacy/microphone_usage_description=""
178+
privacy/camera_usage_description=""
179+
privacy/location_usage_description=""
180+
privacy/address_book_usage_description=""
181+
privacy/calendar_usage_description=""
182+
privacy/photos_library_usage_description=""
183+
privacy/desktop_folder_usage_description=""
184+
privacy/documents_folder_usage_description=""
185+
privacy/downloads_folder_usage_description=""
186+
privacy/network_volumes_usage_description=""
187+
privacy/removable_volumes_usage_description=""
131188
texture_format/s3tc=true
132189
texture_format/etc=false
133190
texture_format/etc2=false

project.godot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ _global_script_classes=[ {
7474
"language": "GDScript",
7575
"path": "res://resources/Documentation.gd"
7676
}, {
77-
"base": "Reference",
77+
"base": "Node2D",
7878
"class": "DrawingTurtle",
7979
"language": "GDScript",
8080
"path": "res://course/common/turtle/DrawingTurtle.gd"

0 commit comments

Comments
 (0)