Set the base branch to master in the workflows file.

This commit is contained in:
Relintai 2022-03-20 11:19:29 +01:00
parent 3f6c1cb80d
commit ea0604573b
8 changed files with 11 additions and 11 deletions

View File

@ -15,8 +15,8 @@ runs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ${{inputs.scons-cache}} path: ${{inputs.scons-cache}}
key: ${{inputs.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}} key: ${{inputs.cache-name}}-${{env.PANDEMONIUM_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
restore-keys: | restore-keys: |
${{inputs.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}} ${{inputs.cache-name}}-${{env.PANDEMONIUM_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
${{inputs.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}} ${{inputs.cache-name}}-${{env.PANDEMONIUM_BASE_BRANCH}}-${{github.ref}}
${{inputs.cache-name}}-${{env.GODOT_BASE_BRANCH}} ${{inputs.cache-name}}-${{env.PANDEMONIUM_BASE_BRANCH}}

View File

@ -5,7 +5,7 @@ on: [push, pull_request]
# disable werrors for now # disable werrors for now
# werror=yes # werror=yes
env: env:
GODOT_BASE_BRANCH: 3.x PANDEMONIUM_BASE_BRANCH: master
SCONSFLAGS: verbose=yes warnings=all debug_symbols=no SCONSFLAGS: verbose=yes warnings=all debug_symbols=no
concurrency: concurrency:

View File

@ -5,7 +5,7 @@ on: [push, pull_request]
# disable werrors for now # disable werrors for now
# werror=yes # werror=yes
env: env:
GODOT_BASE_BRANCH: 3.x PANDEMONIUM_BASE_BRANCH: master
SCONSFLAGS: verbose=yes warnings=all debug_symbols=no SCONSFLAGS: verbose=yes warnings=all debug_symbols=no
concurrency: concurrency:

View File

@ -5,7 +5,7 @@ on: [push, pull_request]
# disable werrors for now # disable werrors for now
# werror=yes # werror=yes
env: env:
GODOT_BASE_BRANCH: 3.x PANDEMONIUM_BASE_BRANCH: master
SCONSFLAGS: verbose=yes warnings=all debug_symbols=no SCONSFLAGS: verbose=yes warnings=all debug_symbols=no
EM_VERSION: 2.0.25 EM_VERSION: 2.0.25
EM_CACHE_FOLDER: "emsdk-cache" EM_CACHE_FOLDER: "emsdk-cache"

View File

@ -3,7 +3,7 @@ on: [push, pull_request]
# Global Settings # Global Settings
env: env:
GODOT_BASE_BRANCH: 3.x PANDEMONIUM_BASE_BRANCH: master
SCONSFLAGS: verbose=yes warnings=all werror=yes SCONSFLAGS: verbose=yes warnings=all werror=yes
concurrency: concurrency:

View File

@ -5,7 +5,7 @@ on: [push, pull_request]
# disable werrors for now # disable werrors for now
# werror=yes # werror=yes
env: env:
GODOT_BASE_BRANCH: 3.x PANDEMONIUM_BASE_BRANCH: master
SCONSFLAGS: verbose=yes warnings=all debug_symbols=no SCONSFLAGS: verbose=yes warnings=all debug_symbols=no
concurrency: concurrency:

View File

@ -3,7 +3,7 @@ on: [push, pull_request]
# Global Settings # Global Settings
env: env:
GODOT_BASE_BRANCH: 3.x PANDEMONIUM_BASE_BRANCH: master
SCONSFLAGS: verbose=yes warnings=all werror=yes debug_symbols=no SCONSFLAGS: verbose=yes warnings=all werror=yes debug_symbols=no
concurrency: concurrency:

View File

@ -4,7 +4,7 @@ on: [push, pull_request]
# Global Settings # Global Settings
# SCONS_CACHE for windows must be set in the build environment # SCONS_CACHE for windows must be set in the build environment
env: env:
GODOT_BASE_BRANCH: 3.x PANDEMONIUM_BASE_BRANCH: master
SCONSFLAGS: verbose=yes warnings=all werror=yes debug_symbols=no SCONSFLAGS: verbose=yes warnings=all werror=yes debug_symbols=no
SCONS_CACHE_MSVC_CONFIG: true SCONS_CACHE_MSVC_CONFIG: true