builds godot
thread & gdnative js builds & update links & split workflows
bendn 2022-08-12
parent 040135d · commit 5bd6de5
-rw-r--r--.github/actions/build-godot/action.yml2
-rw-r--r--.github/actions/build-upload-image/action.yml2
-rw-r--r--.github/actions/get-version/action.yml2
-rw-r--r--.github/workflows/build-3-all.yml26
-rw-r--r--.github/workflows/build-3.5-2d.yml18
-rw-r--r--.github/workflows/build-3.5-normal.yml20
-rw-r--r--.github/workflows/build-3.x-2d.yml20
-rw-r--r--.github/workflows/build-3.x-normal.yml22
-rw-r--r--.github/workflows/build-3.x.yml28
-rw-r--r--.github/workflows/manual-build.yml2
-rw-r--r--.github/workflows/reusable-build.yml53
-rw-r--r--Dockerfile2
12 files changed, 114 insertions, 83 deletions
diff --git a/.github/actions/build-godot/action.yml b/.github/actions/build-godot/action.yml
index 8c6d116..3300261 100644
--- a/.github/actions/build-godot/action.yml
+++ b/.github/actions/build-godot/action.yml
@@ -20,7 +20,7 @@ runs:
using: "composite"
steps:
- name: Setup
- uses: bend-n/godot-2d-builds/.github/actions/setup@main
+ uses: bend-n/godot-builds/.github/actions/setup@main
with:
ref: ${{ env.ref }}
diff --git a/.github/actions/build-upload-image/action.yml b/.github/actions/build-upload-image/action.yml
index 14a0d44..769b96a 100644
--- a/.github/actions/build-upload-image/action.yml
+++ b/.github/actions/build-upload-image/action.yml
@@ -16,7 +16,7 @@ runs:
- uses: actions/checkout@v3
- name: Get version
- uses: bend-n/godot-2d-builds/.github/actions/get-version@main
+ uses: bend-n/godot-builds/.github/actions/get-version@main
- name: Get templates
uses: actions/download-artifact@v3
diff --git a/.github/actions/get-version/action.yml b/.github/actions/get-version/action.yml
index 601f484..cb89328 100644
--- a/.github/actions/get-version/action.yml
+++ b/.github/actions/get-version/action.yml
@@ -5,7 +5,7 @@ runs:
using: "composite"
steps:
- name: Setup
- uses: bend-n/godot-2d-builds/.github/actions/setup@main
+ uses: bend-n/godot-builds/.github/actions/setup@main
with:
ref: ${{ env.ref }}
diff --git a/.github/workflows/build-3-all.yml b/.github/workflows/build-3-all.yml
deleted file mode 100644
index 2af6a64..0000000
--- a/.github/workflows/build-3-all.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Build godot 3.5 stable
-
-on:
- workflow_dispatch:
- push:
- branches:
- - main
- paths:
- - .github/*.py
- - "**.yml"
-
-jobs:
- build3-5-stable-2d:
- name: Build 3.5 stable (2d)
- uses: bend-n/godot-2d-builds/.github/workflows/reusable-build.yml@main
- with:
- ref: 3.5-stable
- secrets: inherit
- build3-5-stable-normal:
- name: Build 3.5 stable (normal)
- uses: bend-n/godot-2d-builds/.github/workflows/reusable-build.yml@main
- with:
- ref: 3.5-stable
- name: godot
- modules-url: https://raw.githubusercontent.com/bend-n/godot-2d-builds/main/.github/normal-build-modules.py
- secrets: inherit
diff --git a/.github/workflows/build-3.5-2d.yml b/.github/workflows/build-3.5-2d.yml
new file mode 100644
index 0000000..d06a76c
--- /dev/null
+++ b/.github/workflows/build-3.5-2d.yml
@@ -0,0 +1,18 @@
+name: Build godot 3.5 stable (2d)
+
+on:
+ workflow_dispatch:
+ push:
+ branches:
+ - main
+ paths:
+ - .github/2d*.py
+ - "**.yml"
+
+jobs:
+ build:
+ name: Build
+ uses: bend-n/godot-builds/.github/workflows/reusable-build.yml@main
+ with:
+ ref: 3.5-stable
+ secrets: inherit
diff --git a/.github/workflows/build-3.5-normal.yml b/.github/workflows/build-3.5-normal.yml
new file mode 100644
index 0000000..d129aa1
--- /dev/null
+++ b/.github/workflows/build-3.5-normal.yml
@@ -0,0 +1,20 @@
+name: Build godot 3.5 stable (normal)
+
+on:
+ workflow_dispatch:
+ push:
+ branches:
+ - main
+ paths:
+ - .github/normal*.py
+ - "**.yml"
+
+jobs:
+ build:
+ name: Build
+ uses: bend-n/godot-builds/.github/workflows/reusable-build.yml@main
+ with:
+ ref: 3.5-stable
+ name: godot
+ modules-url: https://raw.githubusercontent.com/bend-n/godot-builds/main/.github/normal-build-modules.py
+ secrets: inherit
diff --git a/.github/workflows/build-3.x-2d.yml b/.github/workflows/build-3.x-2d.yml
new file mode 100644
index 0000000..cf9f012
--- /dev/null
+++ b/.github/workflows/build-3.x-2d.yml
@@ -0,0 +1,20 @@
+name: Build godot on branch 3.x (2d)
+
+on:
+ workflow_dispatch:
+ schedule:
+ - cron: "0 0 * * *"
+ push:
+ branches:
+ - main
+ paths:
+ - .github/2d*.py
+ - "**.yml"
+
+jobs:
+ build:
+ name: Build
+ uses: bend-n/godot-builds/.github/workflows/reusable-build.yml@main
+ with:
+ ref: 3.x
+ secrets: inherit
diff --git a/.github/workflows/build-3.x-normal.yml b/.github/workflows/build-3.x-normal.yml
new file mode 100644
index 0000000..1b3fec5
--- /dev/null
+++ b/.github/workflows/build-3.x-normal.yml
@@ -0,0 +1,22 @@
+name: Build godot on branch 3.x (normal)
+
+on:
+ workflow_dispatch:
+ schedule:
+ - cron: "0 0 * * *"
+ push:
+ branches:
+ - main
+ paths:
+ - .github/normal*.py
+ - "**.yml"
+
+jobs:
+ build:
+ name: Build
+ uses: bend-n/godot-builds/.github/workflows/reusable-build.yml@main
+ with:
+ ref: 3.x
+ name: godot
+ modules-url: https://raw.githubusercontent.com/bend-n/godot-builds/main/.github/normal-build-modules.py
+ secrets: inherit
diff --git a/.github/workflows/build-3.x.yml b/.github/workflows/build-3.x.yml
deleted file mode 100644
index 6704a17..0000000
--- a/.github/workflows/build-3.x.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Build godot 2d on branch 3.x
-
-on:
- workflow_dispatch:
- schedule:
- - cron: "0 0 * * *"
- push:
- branches:
- - main
- paths:
- - .github/*.py
- - "**.yml"
-
-jobs:
- build-3x:
- name: Build 3.x (2d)
- uses: bend-n/godot-2d-builds/.github/workflows/reusable-build.yml@main
- with:
- ref: 3.x
- secrets: inherit
- build-3x-normal:
- name: Build 3.x (normal)
- uses: bend-n/godot-2d-builds/.github/workflows/reusable-build.yml@main
- with:
- ref: 3.x
- name: godot
- modules-url: https://raw.githubusercontent.com/bend-n/godot-2d-builds/main/.github/normal-build-modules.py
- secrets: inherit
diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml
index 8f04335..99751e1 100644
--- a/.github/workflows/manual-build.yml
+++ b/.github/workflows/manual-build.yml
@@ -11,7 +11,7 @@ on:
jobs:
manual-build:
name: Build ${{ inputs.ref }}
- uses: bend-n/godot-2d-builds/.github/workflows/reusable-build.yml@main
+ uses: bend-n/godot-builds/.github/workflows/reusable-build.yml@main
with:
ref: ${{ inputs.ref }}
secrets: inherit
diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
index 597abad..2395607 100644
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml
@@ -12,7 +12,7 @@ on:
required: false
modules-url:
type: string
- default: "https://raw.githubusercontent.com/bend-n/godot-2d-builds/main/.github/2d-build-modules.py"
+ default: "https://raw.githubusercontent.com/bend-n/godot-builds/main/.github/2d-build-modules.py"
required: false
name:
type: string
@@ -27,7 +27,7 @@ env:
jobs:
linux:
- name: Build linux templates
+ name: Linux temps
runs-on: ubuntu-20.04
strategy:
matrix:
@@ -35,14 +35,14 @@ jobs:
bits: [64]
steps:
- name: Compilation
- uses: bend-n/godot-2d-builds/.github/actions/build-godot@main
+ uses: bend-n/godot-builds/.github/actions/build-godot@main
with:
target: ${{ matrix.target }}
flags: bits=${{ matrix.bits }} ${{ env.flags }}
platform: x11
- name: Upload artifact
- uses: bend-n/godot-2d-builds/.github/actions/upload-artifact@main
+ uses: bend-n/godot-builds/.github/actions/upload-artifact@main
with:
path: godot/bin/*.64
@@ -51,23 +51,23 @@ jobs:
matrix:
target: [release, release_debug]
bits: [64]
- name: Build windows templates
+ name: Win temps
runs-on: windows-latest
steps:
- name: Compilation
- uses: bend-n/godot-2d-builds/.github/actions/build-godot@main
+ uses: bend-n/godot-builds/.github/actions/build-godot@main
with:
target: ${{ matrix.target }}
flags: bits=${{ matrix.bits }} ${{ env.flags }}
platform: windows
- name: Upload artifact
- uses: bend-n/godot-2d-builds/.github/actions/upload-artifact@main
+ uses: bend-n/godot-builds/.github/actions/upload-artifact@main
with:
path: godot/bin/*.exe
android:
- name: Build android templates
+ name: Android temps
runs-on: ubuntu-20.04
strategy:
matrix:
@@ -79,14 +79,14 @@ jobs:
java-version: 11
- name: Compilation (armv7)
- uses: bend-n/godot-2d-builds/.github/actions/build-godot@main
+ uses: bend-n/godot-builds/.github/actions/build-godot@main
with:
target: ${{ matrix.target }}
flags: android_arch=armv7 ${{ env.flags }}
platform: android
- name: Compilation (arm64v8)
- uses: bend-n/godot-2d-builds/.github/actions/build-godot@main
+ uses: bend-n/godot-builds/.github/actions/build-godot@main
with:
target: ${{ matrix.target }}
flags: android_arch=arm64v8 ${{ env.flags }}
@@ -98,7 +98,7 @@ jobs:
(cd platform/android/java && ./gradlew generateGodotTemplates)
- name: Upload artifact
- uses: bend-n/godot-2d-builds/.github/actions/upload-artifact@main
+ uses: bend-n/godot-builds/.github/actions/upload-artifact@main
with:
path: godot/bin/*.apk
@@ -107,18 +107,18 @@ jobs:
matrix:
target: [release, release_debug]
- name: Build macos templates
+ name: MacOS temps
runs-on: macos-latest
steps:
- name: Compilation(x86_64)
- uses: bend-n/godot-2d-builds/.github/actions/build-godot@main
+ uses: bend-n/godot-builds/.github/actions/build-godot@main
with:
flags: arch=x86_64 ${{ env.flags }}
target: ${{ matrix.target }}
platform: macos
- name: Compilation(arm64)
- uses: bend-n/godot-2d-builds/.github/actions/build-godot@main
+ uses: bend-n/godot-builds/.github/actions/build-godot@main
with:
flags: arch=arm64 ${{ env.flags }}
target: ${{ matrix.target }}
@@ -134,7 +134,7 @@ jobs:
strip "bin/godot.osx.opt$target.universal"
- name: Upload artifact
- uses: bend-n/godot-2d-builds/.github/actions/upload-artifact@main
+ uses: bend-n/godot-builds/.github/actions/upload-artifact@main
with:
path: godot/bin/*.universal
@@ -142,8 +142,9 @@ jobs:
strategy:
matrix:
target: [release, release_debug]
+ flags: [gdnative_enabled=yes, threads_enabled=yes, ""]
- name: Build javascript templates
+ name: JS temps
runs-on: ubuntu-20.04
steps:
- name: Set up Emscripten 3.1.10
@@ -156,20 +157,20 @@ jobs:
emcc -v
- name: Compilation
- uses: bend-n/godot-2d-builds/.github/actions/build-godot@main
+ uses: bend-n/godot-builds/.github/actions/build-godot@main
with:
target: ${{ matrix.target }}
- flags: ${{ env.flags }}
+ flags: ${{ env.flags }} ${{ matrix.flags }}
platform: javascript
- name: Upload artifact
- uses: bend-n/godot-2d-builds/.github/actions/upload-artifact@main
+ uses: bend-n/godot-builds/.github/actions/upload-artifact@main
with:
path: godot/bin/*.zip
templates:
needs: [javascript, macos, windows, linux, android]
- name: Bundle up all templates
+ name: Bundle all templates
runs-on: ubuntu-latest
env:
tmps: "templates"
@@ -204,12 +205,16 @@ jobs:
echo "Preparing web"
mv javascript/godot.javascript.opt.zip ${tmps}/webassembly_release.zip
mv javascript/godot.javascript.opt.debug.zip ${tmps}/webassembly_debug.zip
+ mv javascript/godot.javascript.opt.threads.zip ${tmps}/webassembly_threads_release.zip
+ mv javascript/godot.javascript.opt.debug.threads.zip ${tmps}/webassembly_threads_debug.zip
+ mv javascript/godot.javascript.opt.gdnative.zip ${tmps}/webassembly_gdnative_release.zip
+ mv javascript/godot.javascript.opt.debug.gdnative.zip ${tmps}/webassembly_gdnative_debug.zip
- name: Prepare bundle
run: "cd ${tmps} && zip -q -9 -r templates.tpz ./*"
- name: Upload artifact
- uses: bend-n/godot-2d-builds/.github/actions/upload-artifact@main
+ uses: bend-n/godot-builds/.github/actions/upload-artifact@main
with:
path: ${{ env.tmps }}/templates.tpz
@@ -222,7 +227,7 @@ jobs:
runs-on: ubuntu-18.04
steps:
- name: Build editor
- uses: bend-n/godot-2d-builds/.github/actions/build-godot@main
+ uses: bend-n/godot-builds/.github/actions/build-godot@main
with:
platform: ${{ matrix.platform }}
target: release_debug
@@ -231,7 +236,7 @@ jobs:
flags: "" # override flags
- name: Upload artifact
- uses: bend-n/godot-2d-builds/.github/actions/upload-artifact@main
+ uses: bend-n/godot-builds/.github/actions/upload-artifact@main
with:
name: ${{ matrix.platform }}-tools-release
path: godot/bin/*.64
@@ -241,7 +246,7 @@ jobs:
runs-on: ubuntu-latest
needs: [tools, templates]
steps:
- - uses: bend-n/godot-2d-builds/.github/actions/build-upload-image@main
+ - uses: bend-n/godot-builds/.github/actions/build-upload-image@main
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
name: ${{ inputs.name }}
diff --git a/Dockerfile b/Dockerfile
index c47e4c2..4a1968a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,7 +31,7 @@ RUN mkdir ~/.cache \
&& rm /root/templates.tpz
# Install editor-settings.tres
-ADD https://raw.githubusercontent.com/bend-n/godot-2d-builds/main/.github/editor-settings.tres /root/.config/godot/editor_settings-3.tres
+ADD https://raw.githubusercontent.com/bend-n/godot-builds/main/.github/editor-settings.tres /root/.config/godot/editor_settings-3.tres
# Test if godot is working
RUN godot -e -q