Commit Graph

559 Commits (07153d40e0e5c25de1fd2d00da3a1669e7ea7e64)

Author SHA1 Message Date
David Snopek 07153d40e0
Merge pull request #1531 from akien-mga/3.x-py-two-old
[3.x] SCons: Remove old Python 2 compat code
2024-07-24 09:06:23 -05:00
Rémi Verschelde cc8c15c32f
SCons: Remove old Python 2 compat code 2024-07-18 10:39:14 +02:00
Rémi Verschelde a4aecf3295
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:21:17 +02:00
Rémi Verschelde 0c3672e494
Merge pull request #1254 from akien-mga/3.x-ci-update-images
[3.x] CI: Update all images and actions
2023-09-26 23:09:41 +02:00
Rémi Verschelde 5f401ad88a
CI: Update all images and actions 2023-09-26 22:58:12 +02:00
Rémi Verschelde bbcf901eab
Merge pull request #1168 from aaronfranke/3.x-ubuntu-version
[3.x] Bump Ubuntu version on CI from 18.04 to 20.04
2023-07-08 09:15:14 +02:00
Aaron Franke 102e3c8d16
Bump Ubuntu version on CI from 18.04 to 20.04 2023-07-07 21:44:24 -05:00
Rémi Verschelde 7c09b5484d
Merge pull request #981 from Faless/build/3.x_qol_backports
[3.x] [SCons] Backport SCons generator, cache.
2023-01-09 23:25:02 +01:00
Fabio Alessandrelli 686db8ea6e [SCons] Backport SCons generator, cache. 2022-12-29 17:51:29 +01:00
Rémi Verschelde 97c181a246
Merge pull request #832 from aaronfranke/3.x-ci 2022-09-08 09:47:54 +02:00
Aaron Franke 62714899ff
Upgrade 3.x CI to Godot 3.5-stable 2022-09-07 22:30:09 -05:00
Fabio Alessandrelli 02333f8dae [CI] Fix Android builds after GH container update.
(cherry picked from commit 0943dfc34a)
2022-08-07 15:46:39 +02:00
Rémi Verschelde 867374da40 headers: Sync with upstream 3.x commit a1c0be731 2022-08-03 10:13:24 +02:00
Rémi Verschelde 7a193d3857 headers: Sync with upstream 3.x commit 38b95cc2f 2022-07-22 11:07:49 +02:00
Rémi Verschelde dac7dc2a35 CI: Use setup-python@v4
(cherry picked from commit c7a30aec03)
2022-07-22 11:06:30 +02:00
dependabot[bot] a930046796 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:30 +02:00
Hugo Locurcio db93fbb5f7 Print a warning with unknown SCons variables to ease troubleshooting
(cherry picked from commit 1e2eafe777)
2022-07-22 11:06:30 +02:00
Rémi Verschelde 15e173d159 headers: Sync with upstream 3.x commit 3f6dd3352 2022-07-18 14:46:34 +02:00
Joshua Cooper 43fae056d0 CMake: fix CMAKE_BUILD_TYPE and BITS check
(cherry picked from commit 165ad14b0f)
2022-07-18 14:00:28 +02:00
Rémi Verschelde bf0d95369d CMake: Don't use `-fPIC` on Windows (#732)
(cherry picked from commits 3c73d1a7a2
and 9b4519280a)
2022-07-18 13:00:17 +02:00
Rémi Verschelde e7ebeccd25 SCons: Default `num_jobs` to max CPUs minus 1 if not specified
This doesn't change the behavior when `--jobs`/`-j` is specified as a
command-line argument or in `SCONSFLAGS`.

The SCons hack used to know if `num_jobs` was set by the user is derived
from the MongoDB setup.

We use `os.cpu_count()` for portability (available since Python 3.4).

With 4 CPUs or less, we use the max. With more than 4 we use max - 1 to
preserve some bandwidth for the user's other programs.

Makefile: Dehardcode -j4, SCons defaults to max - 1

(cherry picked from commits cdcd473371 and
c2b35fb226)
2022-07-18 13:00:17 +02:00
Rémi Verschelde 3e1f8f3d89
Merge pull request #667 from theomonnom/patch-1 2022-07-18 11:49:14 +02:00
Rémi Verschelde 2b9843d573 headers: Sync with upstream 3.x commit 28d387f72 2022-06-28 21:51:33 +02:00
Rémi Verschelde 9e5341a5c1
Merge pull request #776 from Faless/fix/3.x_rect2 2022-06-27 12:01:14 +02:00
Fabio Alessandrelli 7bff71a9f5 Fix Rect2::distance_to not returning 0.
Was relying on comparison with 1e20 which cannot be represented as
float, causing some epsilon to always be returned and compilers
complaining when using -Werror.
2022-06-27 10:40:24 +02:00
Rémi Verschelde ac572d5f84
Merge pull request #691 from Faless/build/3.x_tools 2022-06-13 14:17:34 +02:00
Fabio Alessandrelli c7b81a15f6 [SCons] Fix android build with modern NDKs. 2022-06-08 23:02:21 +02:00
Rémi Verschelde 95258f61f4 headers: Sync with upstream 3.x commit f33899d 2022-05-18 12:56:09 +02:00
Rémi Verschelde f9f6767722 headers: Sync with upstream 3.x commit 21827a7 2022-05-05 00:19:10 +02:00
Fabio Alessandrelli 9451c184b1 [CI] Matrix build for all platforms.
Test is only run on macOS and Linux.
2022-04-14 05:22:50 +02:00
Fabio Alessandrelli ca7cd22326 Library SCons boilerplate to build projects. 2022-04-14 05:22:50 +02:00
Rémi Verschelde 7d00a6e05b headers: Sync with upstream 3.x commit 21c3048 2022-04-04 13:47:02 +02:00
Rémi Verschelde 3427c97f24 CI: Install MinGW via `egor-tensin/setup-mingw`
Scoop install is being problematic since their 0.1.0 release.

(cherry picked from commit 3846201fbb)
2022-04-04 12:31:26 +02:00
Rémi Verschelde 7a3ad31dc4 Update copyright year 2022-04-04 12:28:54 +02:00
Rémi Verschelde 2eedcb0131
Merge pull request #710 from aaronfranke/3.x-black
[3.x] Run black format on SConstruct files and bindings generator
2022-02-26 23:44:16 +01:00
Aaron Franke f230e51e98
[3.x] Run black format on SConstruct files and bindings generator 2022-02-26 15:03:55 -06:00
Hugo Locurcio 63df6debdf
Merge pull request #676 from Ivorforce/patch-3 2022-01-26 18:47:15 +01:00
Ivorius 09249530bd
In CMakeLists, use the new FindPython3 instead of FindPython 2021-12-29 15:04:57 +01:00
Théo Monnom c1f632a146
Generate bin files in the current CMake source dir
Use CMAKE_CURRENT_SOURCE_DIR to generate the binary in the current CMake directory instead of building it at the top level of the source tree
2021-12-05 17:49:50 +01:00
Rémi Verschelde 4efceefe13
Merge pull request #666 from BimDav/fix_variant_operator= 2021-12-03 12:09:51 +01:00
BimDav a93f7f9e73 Call Variant destructor in operator= 2021-12-03 11:11:32 +01:00
Rémi Verschelde b31e690a91
Merge pull request #665 from akien-mga/3.x-ci-godot-3.4 2021-12-02 10:42:15 +01:00
Rémi Verschelde a0f2ab1f31
CI: Update Godot binary to 3.4-stable for tests 2021-12-02 10:32:56 +01:00
Rémi Verschelde 68ce78179f
headers: Track tag godot-3.4-stable 2021-11-04 15:39:20 +01:00
Rémi Verschelde c12e9a3195
test: Style cleanup after opening in 3.4 2021-11-04 15:38:05 +01:00
Rémi Verschelde 1070a29d77
Add `.gitignore` for test, ignore potential log files 2021-11-04 15:32:51 +01:00
Rémi Verschelde 8366761930
Merge pull request #637 from Faless/osx/3.x_universal 2021-10-04 09:13:17 +02:00
Fabio Alessandrelli de89011ca4 [CI] Use MacOS universal build instead of 2 builds.
Switch to the now available macOS 11 for building.
2021-10-02 14:01:13 +02:00
Fabio Alessandrelli a1337a2dd7 [OSX] Add universal build support. 2021-10-02 14:01:13 +02:00
Rémi Verschelde 99e9dd1d93
Merge pull request #621 from akien-mga/3.4-beta5 2021-09-27 13:12:10 +02:00