From 3311550b266556546e662ee2247d8e92ff3ab3ed Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Wed, 22 May 2024 16:13:21 +0200 Subject: [PATCH] [godot] Use Scons 4.4.0 for 3.x Godot build --- .github/actions/setup-godot-deps-3/action.yml | 32 +++++++++++++++++++ .../action.yml | 0 .github/workflows/spine-godot-v4.yml | 18 +++++------ .github/workflows/spine-godot.yml | 18 +++++------ 4 files changed, 50 insertions(+), 18 deletions(-) create mode 100644 .github/actions/setup-godot-deps-3/action.yml rename .github/actions/{setup-godot-deps => setup-godot-deps-4}/action.yml (100%) diff --git a/.github/actions/setup-godot-deps-3/action.yml b/.github/actions/setup-godot-deps-3/action.yml new file mode 100644 index 000000000..4127007e9 --- /dev/null +++ b/.github/actions/setup-godot-deps-3/action.yml @@ -0,0 +1,32 @@ +name: Setup python and scons +description: Setup python, install the pip version of scons. +inputs: + python-version: + description: The python version to use. + default: "3.x" + python-arch: + description: The python architecture. + default: "x64" +runs: + using: "composite" + steps: + # Use python 3.x release (works cross platform) + - name: Set up Python 3.x + uses: actions/setup-python@v5 + with: + # Semantic version range syntax or exact version of a Python version + python-version: ${{ inputs.python-version }} + # Optional - x64 or x86 architecture, defaults to x64 + architecture: ${{ inputs.python-arch }} + + - name: Setup scons + shell: bash + run: | + python -c "import sys; print(sys.version)" + python -m pip install scons==4.4.0 + scons --version + + - name: Setup dotnet 6 + uses: actions/setup-dotnet@v3 + with: + dotnet-version: '6.0.x' \ No newline at end of file diff --git a/.github/actions/setup-godot-deps/action.yml b/.github/actions/setup-godot-deps-4/action.yml similarity index 100% rename from .github/actions/setup-godot-deps/action.yml rename to .github/actions/setup-godot-deps-4/action.yml diff --git a/.github/workflows/spine-godot-v4.yml b/.github/workflows/spine-godot-v4.yml index 17af3e2ec..4b15f1538 100644 --- a/.github/workflows/spine-godot-v4.yml +++ b/.github/workflows/spine-godot-v4.yml @@ -50,7 +50,7 @@ jobs: fetch-depth: 0 - name: Setup python and scons - uses: ./.github/actions/setup-godot-deps + uses: ./.github/actions/setup-godot-deps-4 - name: Build Godot artifact shell: bash @@ -72,7 +72,7 @@ jobs: fetch-depth: 0 - name: Setup python and scons - uses: ./.github/actions/setup-godot-deps + uses: ./.github/actions/setup-godot-deps-4 - name: Build Godot artifact shell: bash @@ -96,7 +96,7 @@ jobs: fetch-depth: 0 - name: Setup python and scons - uses: ./.github/actions/setup-godot-deps + uses: ./.github/actions/setup-godot-deps-4 - name: Build Godot artifact shell: bash @@ -124,7 +124,7 @@ jobs: fetch-depth: 0 - name: Setup python and scons - uses: ./.github/actions/setup-godot-deps + uses: ./.github/actions/setup-godot-deps-4 - name: Build Godot artifact run: | @@ -146,7 +146,7 @@ jobs: fetch-depth: 0 - name: Setup python and scons - uses: ./.github/actions/setup-godot-deps + uses: ./.github/actions/setup-godot-deps-4 - name: Build Godot artifact run: | @@ -168,7 +168,7 @@ jobs: fetch-depth: 0 - name: Setup python and scons - uses: ./.github/actions/setup-godot-deps + uses: ./.github/actions/setup-godot-deps-4 - name: Build Godot artifact run: | @@ -197,7 +197,7 @@ jobs: fetch-depth: 0 - name: Setup python and scons - uses: ./.github/actions/setup-godot-deps + uses: ./.github/actions/setup-godot-deps-4 - name: Build Godot artifact shell: bash @@ -238,7 +238,7 @@ jobs: java-version: 17 - name: Setup python and scons - uses: ./.github/actions/setup-godot-deps + uses: ./.github/actions/setup-godot-deps-4 - name: Build Godot artifact shell: bash @@ -283,7 +283,7 @@ jobs: emcc -v - name: Setup python and scons - uses: ./.github/actions/setup-godot-deps + uses: ./.github/actions/setup-godot-deps-4 - name: Build Godot artifact run: | diff --git a/.github/workflows/spine-godot.yml b/.github/workflows/spine-godot.yml index cd3d9af80..a1aff5988 100644 --- a/.github/workflows/spine-godot.yml +++ b/.github/workflows/spine-godot.yml @@ -24,7 +24,7 @@ jobs: fetch-depth: 0 - name: Setup python and scons - uses: ./.github/actions/setup-godot-deps + uses: ./.github/actions/setup-godot-deps-3 - name: Build Godot artifact shell: bash @@ -46,7 +46,7 @@ jobs: fetch-depth: 0 - name: Setup python and scons - uses: ./.github/actions/setup-godot-deps + uses: ./.github/actions/setup-godot-deps-3 - name: Build Godot artifact shell: bash @@ -70,7 +70,7 @@ jobs: fetch-depth: 0 - name: Setup python and scons - uses: ./.github/actions/setup-godot-deps + uses: ./.github/actions/setup-godot-deps-3 - name: Build Godot artifact shell: bash @@ -95,7 +95,7 @@ jobs: fetch-depth: 0 - name: Setup python and scons - uses: ./.github/actions/setup-godot-deps + uses: ./.github/actions/setup-godot-deps-3 - name: Build Godot artifact run: | @@ -116,7 +116,7 @@ jobs: fetch-depth: 0 - name: Setup python and scons - uses: ./.github/actions/setup-godot-deps + uses: ./.github/actions/setup-godot-deps-3 - name: Build Godot artifact run: | @@ -137,7 +137,7 @@ jobs: fetch-depth: 0 - name: Setup python and scons - uses: ./.github/actions/setup-godot-deps + uses: ./.github/actions/setup-godot-deps-3 - name: Build Godot artifact run: | @@ -166,7 +166,7 @@ jobs: fetch-depth: 0 - name: Setup python and scons - uses: ./.github/actions/setup-godot-deps + uses: ./.github/actions/setup-godot-deps-3 - name: Build Godot artifact shell: bash @@ -206,7 +206,7 @@ jobs: java-version: 11 - name: Setup python and scons - uses: ./.github/actions/setup-godot-deps + uses: ./.github/actions/setup-godot-deps-3 - name: Build Godot artifact shell: bash @@ -249,7 +249,7 @@ jobs: emcc -v - name: Setup python and scons - uses: ./.github/actions/setup-godot-deps + uses: ./.github/actions/setup-godot-deps-3 - name: Build Godot artifact run: |