Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated JavaScript modules for Godot 4.0 branch #150

Merged
merged 1 commit into from
Apr 23, 2023
Merged

Updated JavaScript modules for Godot 4.0 branch #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions .github/actions/godot-build/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Build Godot
description: Build Godot with the provided options.
inputs:
target:
description: The scons target (debug/release_debug/release).
default: debug
description: The scons target (debug/editor/release).
default: editor
tools:
description: If tools are to be built.
default: false
Expand All @@ -20,7 +20,7 @@ inputs:
default: ${{ github.workspace }}/.scons-cache/
scons-cache-limit:
description: The scons cache size limit.
default: 4096
default: 7168
shell:
description: the shell to run this under
default: sh
Expand All @@ -35,7 +35,8 @@ runs:
SCONS_CACHE_LIMIT: ${{ inputs.scons-cache-limit }}
run: |
echo "Building with flags:" ${{ env.SCONSFLAGS }}
scons p=${{ inputs.platform }} target=${{ inputs.target }} tools=${{ inputs.tools }} tests=${{ inputs.tests }} --jobs=2 ${{ env.SCONSFLAGS }}
if [ "${{ inputs.target }}" != "editor" ]; then rm -rf editor; fi # Ensure we don't include editor code.
scons platform=${{ inputs.platform }} target=${{ inputs.target }} tools=${{ inputs.tools }} tests=${{ inputs.tests }} --jobs=2 ${{ env.SCONSFLAGS }}
ls -l bin/
if: inputs.shell == 'sh'
- name: Scons Build
Expand All @@ -46,6 +47,7 @@ runs:
SCONS_CACHE_LIMIT: ${{ inputs.scons-cache-limit }}
run: |
echo "Building with flags:" ${{ env.SCONSFLAGS }}
scons p=${{ inputs.platform }} target=${{ inputs.target }} tools=${{ inputs.tools }} tests=${{ inputs.tests }} --jobs=2 ${{ env.SCONSFLAGS }}
if [ "${{ inputs.target }}" != "editor" ]; then rm -rf editor; rm -rf tools; fi # Ensure we don't include editor code.
scons platform=${{ inputs.platform }} target=${{ inputs.target }} tools=${{ inputs.tools }} tests=${{ inputs.tests }} --jobs=2 ${{ env.SCONSFLAGS }}
ls -l bin/
if: inputs.shell == 'msys2 {0}'
23 changes: 12 additions & 11 deletions .github/workflows/android_builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: 🤖 Android Builds
- push
- pull_request
env:
GODOT_BASE_BRANCH: 3.5-stable
SCONSFLAGS: ' verbose=yes debug_symbols=no'
GODOT_BASE_BRANCH: "4.0"
SCONSFLAGS: verbose=yes warnings=extra debug_symbols=no module_text_server_fb_enabled=yes
concurrency:
group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-android
cancel-in-progress: true
Expand All @@ -21,37 +21,38 @@ jobs:
- name: Checkout ECMAScript
uses: actions/checkout@v2
with:
path: ${{github.workspace}}/modules/ECMAScript/
path: ${{github.workspace}}/modules/javascript/
- name: Make apt sources.list use the default Ubuntu repositories
run: |
sudo rm -f /etc/apt/sources.list.d/*
sudo cp -f misc/ci/sources.list /etc/apt/sources.list
# sudo rm -f /etc/apt/sources.list.d/*
# sudo cp -f misc/ci/sources.list /etc/apt/sources.list
sudo apt-get update
- name: Set up Java 11
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
- name: Setup Godot build cache
uses: ./.github/actions/godot-cache
continue-on-error: true
- name: Setup python and scons
uses: ./modules/ECMAScript/.github/actions/godot-deps
uses: ./modules/javascript/.github/actions/godot-deps
with:
shell: sh
- name: Compilation (armv7)
uses: ./modules/ECMAScript/.github/actions/godot-build
uses: ./modules/javascript/.github/actions/godot-build
with:
sconsflags: ${{ env.SCONSFLAGS }} android_arch=armv7
platform: android
target: release
target: template_release
tools: false
shell: sh
- name: Compilation (arm64v8)
uses: ./modules/ECMAScript/.github/actions/godot-build
uses: ./modules/javascript/.github/actions/godot-build
with:
sconsflags: ${{ env.SCONSFLAGS }} android_arch=arm64v8
platform: android
target: release
target: template_release
tools: false
shell: sh
- name: Generate Godot templates
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ios_builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: 🍏 iOS Builds
- push
- pull_request
env:
GODOT_BASE_BRANCH: 3.5-stable
SCONSFLAGS: ' verbose=yes debug_symbols=no'
GODOT_BASE_BRANCH: "4.0"
SCONSFLAGS: verbose=yes warnings=extra debug_symbols=no module_text_server_fb_enabled=yes
concurrency:
group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-ios
cancel-in-progress: true
Expand All @@ -21,20 +21,20 @@ jobs:
- name: Checkout ECMAScript
uses: actions/checkout@v2
with:
path: ${{github.workspace}}/modules/ECMAScript/
path: ${{github.workspace}}/modules/javascript/
- name: Setup Godot build cache
uses: ./.github/actions/godot-cache
continue-on-error: true
- name: Setup python and scons
uses: ./modules/ECMAScript/.github/actions/godot-deps
uses: ./modules/javascript/.github/actions/godot-deps
with:
shell: sh
- name: Compilation (armv7)
uses: ./modules/ECMAScript/.github/actions/godot-build
uses: ./modules/javascript/.github/actions/godot-build
with:
sconsflags: ${{ env.SCONSFLAGS }}
platform: iphone
target: release
platform: ios
target: template_release
tools: false
shell: sh
- name: Upload artifact
Expand Down
23 changes: 12 additions & 11 deletions .github/workflows/javascript_builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ name: 🌐 JavaScript Builds
- push
- pull_request
env:
GODOT_BASE_BRANCH: 3.5-stable
SCONSFLAGS: ' verbose=yes debug_symbols=no'
EM_VERSION: 2.0.25
EM_CACHE_FOLDER: emsdk-cache
GODOT_BASE_BRANCH: "4.0"
SCONSFLAGS: verbose=yes warnings=extra debug_symbols=no
EM_VERSION: 3.1.18
EM_CACHE_FOLDER: "emsdk-cache"

concurrency:
group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-javascript
cancel-in-progress: true
Expand All @@ -23,15 +24,15 @@ jobs:
- name: Checkout ECMAScript
uses: actions/checkout@v2
with:
path: ${{github.workspace}}/modules/ECMAScript/
path: ${{github.workspace}}/modules/javascript/
- name: Load Emscripten cache
id: javascript-template-emscripten-cache
uses: actions/cache@v2
with:
path: ${{env.EM_CACHE_FOLDER}}
key: ${{env.EM_VERSION}}-${{github.job}}
- name: Set up Emscripten latest
uses: mymindstorm/setup-emsdk@v10
uses: mymindstorm/setup-emsdk@v12
with:
version: ${{env.EM_VERSION}}
actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
Expand All @@ -42,16 +43,16 @@ jobs:
uses: ./.github/actions/godot-cache
continue-on-error: true
- name: Setup python and scons
uses: ./modules/ECMAScript/.github/actions/godot-deps
uses: ./modules/javascript/.github/actions/godot-deps
with:
shell: sh
- name: Compilation
uses: ./modules/ECMAScript/.github/actions/godot-build
uses: ./modules/javascript/.github/actions/godot-build
with:
sconsflags: ${{ env.SCONSFLAGS }}
platform: javascript
target: release
tools: false
platform: web
target: template_release
tools: falsed
shell: sh
- name: Upload artifact
uses: ./.github/actions/upload-artifact
Loading