Compare commits

...

8 Commits

Author SHA1 Message Date
Rémi Verschelde
6ee24cebdc CI: Update all images and actions
(cherry picked from commit 5f401ad88a)
2023-10-05 22:25:13 +02:00
Rémi Verschelde
51a5eb76a2 CI: Fix MinGW install error by pinning to earlier version
Works around https://github.com/egor-tensin/setup-mingw/issues/14.

(cherry picked from commit 0369f6fea0)
2023-10-04 15:22:40 +02:00
Rémi Verschelde
a2b2e101f8 headers: Track tag godot-3.4.5-stable 2022-08-03 10:09:47 +02:00
Rémi Verschelde
d935a381dc CI: Use setup-python@v4
(cherry picked from commit c7a30aec03)
2022-07-22 11:06:48 +02:00
dependabot[bot]
c44c2e26d5 Bump actions/upload-artifact from 2 to 3
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 4963e6f3fc)
2022-07-22 11:06:48 +02:00
Hugo Locurcio
07f096f2f4 Print a warning with unknown SCons variables to ease troubleshooting
(cherry picked from commit 1e2eafe777)
2022-07-22 11:06:48 +02:00
Rémi Verschelde
36fc84dae7 Merge pull request #770 from Faless/build/3.4_fix_android 2022-06-17 15:23:51 +02:00
Fabio Alessandrelli
ff32433c1c [SCons] Fix Android builds with modern NDKs.
(cherry picked from commit b8ae658981)
2022-06-17 15:00:30 +02:00
3 changed files with 29 additions and 20 deletions

View File

@@ -4,15 +4,15 @@ on: [push, pull_request]
jobs:
linux:
name: Build (Linux, GCC)
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up Python (for SCons)
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.x'
@@ -29,7 +29,7 @@ jobs:
scons target=release generate_bindings=yes -j $(nproc)
- name: Upload artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: godot-cpp-linux-glibc2.27-x86_64-release
path: bin/libgodot-cpp.linux.release.64.a
@@ -48,12 +48,12 @@ jobs:
runs-on: windows-2019
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up Python (for SCons)
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.x'
@@ -66,7 +66,7 @@ jobs:
scons target=release generate_bindings=yes -j $env:NUMBER_OF_PROCESSORS
- name: Upload artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: godot-cpp-windows-msvc2019-x86_64-release
path: bin/libgodot-cpp.windows.release.64.lib
@@ -77,12 +77,12 @@ jobs:
runs-on: windows-2019
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up Python (for SCons)
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.x'
@@ -92,13 +92,15 @@ jobs:
- name: Setup MinGW for Windows/MinGW build
uses: egor-tensin/setup-mingw@v2
with:
version: 12.2.0
- name: Build godot-cpp
run: |
scons target=release generate_bindings=yes use_mingw=yes -j $env:NUMBER_OF_PROCESSORS
- name: Upload artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: godot-cpp-linux-mingw-x86_64-release
path: bin/libgodot-cpp.windows.release.64.a
@@ -109,12 +111,12 @@ jobs:
runs-on: macos-11
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up Python (for SCons)
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.x'
@@ -129,7 +131,7 @@ jobs:
scons target=release generate_bindings=yes -j $(sysctl -n hw.logicalcpu)
- name: Upload artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: godot-cpp-macos-universal-release
path: bin/libgodot-cpp.osx.release.64.a
@@ -148,7 +150,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Make apt sources.list use the default Ubuntu repositories
run: |

View File

@@ -146,6 +146,13 @@ opts.Add(BoolVariable("generate_template_get_node", "Generate a template version
opts.Update(env)
Help(opts.GenerateHelpText(env))
# Detect and print a warning listing unknown SCons variables to ease troubleshooting.
unknown = opts.UnknownVariables()
if unknown:
print("WARNING: Unknown SCons variables were passed and will be ignored:")
for item in unknown.items():
print(" " + item[0] + "=" + item[1])
# This makes sure to keep the session environment variables on Windows.
# This way, you can run SCons in a Visual Studio 2017 prompt and it will find
# all the required tools
@@ -369,11 +376,11 @@ elif env["platform"] == "android":
# Setup tools
env["CC"] = toolchain + "/bin/clang"
env["CXX"] = toolchain + "/bin/clang++"
env["AR"] = toolchain + "/bin/" + arch_info["tool_path"] + "-ar"
env["AS"] = toolchain + "/bin/" + arch_info["tool_path"] + "-as"
env["LD"] = toolchain + "/bin/" + arch_info["tool_path"] + "-ld"
env["STRIP"] = toolchain + "/bin/" + arch_info["tool_path"] + "-strip"
env["RANLIB"] = toolchain + "/bin/" + arch_info["tool_path"] + "-ranlib"
env["AR"] = toolchain + "/bin/llvm-ar"
env["AS"] = toolchain + "/bin/llvm-as"
env["LD"] = toolchain + "/bin/llvm-ld"
env["STRIP"] = toolchain + "/bin/llvm-strip"
env["RANLIB"] = toolchain + "/bin/llvm-ranlib"
env.Append(
CCFLAGS=["--target=" + arch_info["target"] + env["android_api_level"], "-march=" + arch_info["march"], "-fPIC"]