Merge remote-tracking branch 'upstream/master' into gradle-configcache

Author: DSteve595

.github/workflows/build_android.yml

@@ -24,32 +24,32 @@ jobs:
  - name: Build android debug (arm32)
  cache-name: export_template_debug_android_arm32
  target: template_debug
- sconsflags: arch=arm32
+ scons-flags: arch=arm32
 
  - name: Build android release (arm32)
  cache-name: export_template_release_android_arm32
  target: template_release
- sconsflags: arch=arm32
+ scons-flags: arch=arm32
 
  - name: Build android debug (arm64)
  cache-name: export_template_debug_android_arm64
  target: template_debug
- sconsflags: arch=arm64
+ scons-flags: arch=arm64
 
  - name: Build android release (arm64)
  cache-name: export_template_release_android_arm64
  target: template_release
- sconsflags: arch=arm64
+ scons-flags: arch=arm64
 
  - name: Build android debug (x86_64)
  cache-name: export_template_debug_android_x86_64
  target: template_debug
- sconsflags: arch=x86_64
+ scons-flags: arch=x86_64
 
  - name: Build android release (x86_64)
  cache-name: export_template_release_android_x86_64
  target: template_release
- sconsflags: arch=x86_64
+ scons-flags: arch=x86_64
 
  steps:
  - name: Maximize build space
@@ -92,14 +92,14 @@ jobs:
  - name: Compilation release (arm32)
  uses: ./.github/actions/godot-build
  with:
- sconsflags: ${{ env.SCONSFLAGS }} arch=arm32
+ scons-flags: ${{ env.SCONSFLAGS }} arch=arm32
  platform: android
  target: template_release
 
  - name: Compilation
  uses: ./.github/actions/godot-build
  with:
- sconsflags: ${{ matrix.sconsflags }}
+ scons-flags: ${{ matrix.scons-flags }}
  platform: android
  target: ${{ matrix.target }}
 

.github/workflows/build_ios.yml

@@ -20,12 +20,12 @@ jobs:
  - name: Build ios debug (arm64)
  cache-name: export_template_debug_ios_arm64
  target: template_debug
- sconsflags: arch=arm64
+ scons-flags: arch=arm64
 
  - name: Build ios release (arm64)
  cache-name: export_template_release_ios_arm64
  target: template_release
- sconsflags: arch=arm64
+ scons-flags: arch=arm64
 
  steps:
  - name: Clone Godot Engine
@@ -49,7 +49,7 @@ jobs:
  - name: ${{ matrix.name }}
  uses: ./.github/actions/godot-build
  with:
- sconsflags: ${{ matrix.sconsflags }}
+ scons-flags: ${{ matrix.scons-flags }}
  platform: ios
  target: ${{ matrix.target }}
 

.github/workflows/build_linux.yml

@@ -20,27 +20,27 @@ jobs:
  - name: Build editor release x86_64 (target=editor)
  cache-name: editor_release_linux_x86_64
  target: editor
- sconsflags: ''
+ scons-flags: ''
 
  - name: Build editor debug (target=editor, debug_symbols=true )
  cache-name: editor_debug_linux_x86_64
  target: editor
- sconsflags: debug_symbols=true
+ scons-flags: debug_symbols=true
 
  - name: Build editor dev (target=editor, dev_build=yes, debug_symbols=true )
  cache-name: editor_dev_linux_x86_64
  target: editor
- sconsflags: dev_build=yes debug_symbols=true
+ scons-flags: dev_build=yes debug_symbols=true
 
  - name: Build release template x86_64
  cache-name: export_template_release_linux_x86_64
  target: template_release
- sconsflags: ''
+ scons-flags: ''
 
  - name: Build debug template x86_64
  cache-name: export_template_debug_linux_x86_64
  target: template_debug
- sconsflags: ''
+ scons-flags: ''
 
  steps:
  - name: Maximize build space
@@ -78,7 +78,7 @@ jobs:
  - name: Compilation
  uses: ./.github/actions/godot-build
  with:
- sconsflags: ${{ matrix.sconsflags }}
+ scons-flags: ${{ matrix.scons-flags }}
  platform: linuxbsd
  target: ${{ matrix.target }}
 

.github/workflows/build_macos.yml

@@ -20,52 +20,52 @@ jobs:
  - name: Build editor release x86_64 (target=editor)
  cache-name: editor_release_macos_x86_64
  target: editor
- sconsflags: arch=x86_64
+ scons-flags: arch=x86_64
 
  - name: Build editor debug x86_64 (target=editor, debug_symbols=true )
  cache-name: editor_debug_macos_x86_64
  target: editor
- sconsflags: arch=x86_64 debug_symbols=true
+ scons-flags: arch=x86_64 debug_symbols=true
 
  - name: Build editor dev x86_64 (target=editor, dev_build=yes, debug_symbols=true )
  cache-name: editor_dev_macos_x86_64
  target: editor
- sconsflags: arch=x86_64 dev_build=yes debug_symbols=true
+ scons-flags: arch=x86_64 dev_build=yes debug_symbols=true
 
  - name: Build release template x86_64
  cache-name: export_template_release_macos_x86_64
  target: template_release
- sconsflags: arch=x86_64
+ scons-flags: arch=x86_64
 
  - name: Build debug template x86_64
  cache-name: export_template_debug_macos_x86_64
  target: template_debug
- sconsflags: arch=x86_64
+ scons-flags: arch=x86_64
 
  - name: Build editor release arm64 (target=editor)
  cache-name: editor_release_macos_arm64
  target: editor
- sconsflags: arch=arm64
+ scons-flags: arch=arm64
 
  - name: Build editor debug arm64 (target=editor, debug_symbols=true )
  cache-name: editor_debug_macos_arm64
  target: editor
- sconsflags: arch=arm64 debug_symbols=true
+ scons-flags: arch=arm64 debug_symbols=true
 
  - name: Build editor dev arm64 (target=editor, dev_build=yes, debug_symbols=true )
  cache-name: editor_dev_macos_arm64
  target: editor
- sconsflags: arch=arm64 dev_build=yes debug_symbols=true
+ scons-flags: arch=arm64 dev_build=yes debug_symbols=true
 
  - name: Build release template arm64
  cache-name: export_template_release_macos_arm64
  target: template_release
- sconsflags: arch=arm64
+ scons-flags: arch=arm64
 
  - name: Build debug template arm64
  cache-name: export_template_debug_macos_arm64
  target: template_debug
- sconsflags: arch=arm64
+ scons-flags: arch=arm64
 
  steps:
  - name: Clone Godot Engine
@@ -99,7 +99,7 @@ jobs:
  - name: Compilation
  uses: ./.github/actions/godot-build
  with:
- sconsflags: ${{ matrix.sconsflags }}
+ scons-flags: ${{ matrix.scons-flags }}
  platform: macos
  target: ${{ matrix.target }}
 

.github/workflows/build_windows.yml

@@ -25,31 +25,31 @@ jobs:
  cache-name: editor_release_windows_x86_64
  target: editor
  should-clean: true
- sconsflags: ''
+ scons-flags: ''
 
  - name: Build editor debug (target=editor, debug_symbols=true )
  cache-name: editor_debug_windows_x86_64
  target: editor
  should-clean: false
- sconsflags: debug_symbols=true
+ scons-flags: debug_symbols=true
 
  - name: Build editor dev (target=editor, dev_build=yes, debug_symbols=true )
  cache-name: editor_dev_windows_x86_64
  target: editor
  should-clean: false
- sconsflags: dev_build=yes debug_symbols=true
+ scons-flags: dev_build=yes debug_symbols=true
 
  - name: Build release template
  cache-name: export_template_release_windows_x86_64
  target: template_release
  should-clean: true
- sconsflags: ''
+ scons-flags: ''
 
  - name: Build debug template
  cache-name: export_template_debug_windows_x86_64
  target: template_debug
  should-clean: false
- sconsflags: ''
+ scons-flags: ''
 
  steps:
  - name: Clone Godot Engine
@@ -78,7 +78,7 @@ jobs:
  - name: Compilation
  uses: ./.github/actions/godot-build
  with:
- sconsflags: ${{ matrix.sconsflags }}
+ scons-flags: ${{ matrix.scons-flags }}
  platform: windows
  target: ${{ matrix.target }}
 

.github/workflows/deploy_jvm.yml

@@ -132,7 +132,8 @@ jobs:
  run: |
  modules/kotlin_jvm/kt/gradlew -p modules/kotlin_jvm/kt/ :godot-gradle-plugin:publish :godot-gradle-plugin:publishPlugins -Pgradle.publish.key=$GRADLE_PUBLISH_KEY -Pgradle.publish.secret=$GRADLE_PUBLISH_SECRET
 
- - name: Deploy intellij plugin
- shell: sh
- run: |
- modules/kotlin_jvm/kt/gradlew -p modules/kotlin_jvm/kt/ :godot-intellij-plugin:publishPlugin
+# TODO: Re-enable once we fixed the findings by the plugin verification system
+# - name: Deploy intellij plugin
+# shell: sh
+# run: |
+# modules/kotlin_jvm/kt/gradlew -p modules/kotlin_jvm/kt/ :godot-intellij-plugin:publishPlugin

.github/workflows/trigger_dev.yml

@@ -66,9 +66,9 @@ jobs:
  - run: |
  echo "Setup done"
  outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
- godot-kotlin-jvm-version: "0.13.1-4.4.1"
- godot-version: "4.4.1-stable"
- build-version: "0.13.1"
+ godot-kotlin-jvm-version: "0.14.3-4.5.1"
+ godot-version: "4.5.1-stable"
+ build-version: "0.14.3"
  jvm-version: "17"
 
  build-jvm:
@@ -110,4 +110,4 @@ jobs:
  with:
  godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
  jvm-version: ${{ needs.setup-build-variables.outputs['jvm-version'] }}
- build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}
+ build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}

.github/workflows/trigger_on_pull_request.yml

@@ -14,9 +14,9 @@ jobs:
  - run: |
  echo "Setup done"
  outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
- godot-kotlin-jvm-version: "0.13.1-4.4.1"
- godot-version: "4.4.1-stable"
- build-version: "0.13.1"
+ godot-kotlin-jvm-version: "0.14.3-4.5"
+ godot-version: "4.5.1-stable"
+ build-version: "0.14.3"
  jvm-version: "17"
 
  build-jvm:

.github/workflows/trigger_on_push_master.yml

@@ -19,9 +19,9 @@ jobs:
  - run: |
  echo "Setup done"
  outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
- godot-kotlin-jvm-version: "0.13.1-4.4.1"
- godot-version: "4.4.1-stable"
- build-version: "0.13.1"
+ godot-kotlin-jvm-version: "0.14.3-4.5.1"
+ godot-version: "4.5.1-stable"
+ build-version: "0.14.3"
  jvm-version: "17"
 
  build-jvm:
@@ -145,4 +145,4 @@ jobs:
  with:
  godot-kotlin-jvm-version: ${{ needs.setup-build-variables.outputs['godot-kotlin-jvm-version'] }}
  godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
- build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}
+ build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}

.github/workflows/trigger_on_tag.yml

@@ -26,9 +26,9 @@ jobs:
  - run: |
  echo "Setup done"
  outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
- godot-kotlin-jvm-version: "0.13.1-4.4.1"
- godot-version: "4.4.1-stable"
- build-version: "0.13.1"
+ godot-kotlin-jvm-version: "0.14.3-4.5.1"
+ godot-version: "4.5.1-stable"
+ build-version: "0.14.3"
  jvm-version: "17"
 
  build-jvm: