Skip to content

Commit 889af7f

Browse files
committed
Merge remote-tracking branch 'maiself/master' into python-bin
2 parents aa90fdb + 74eaeea commit 889af7f

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

.github/workflows/build.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
submodules: true
3838

3939
- name: Setup Python
40-
uses: actions/setup-python@v4
40+
uses: actions/setup-python@v5
4141
with:
4242
python-version: '3.12'
4343

@@ -73,15 +73,15 @@ jobs:
7373
7474
- name: Upload artifacts (Linux, macOS)
7575
if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
76-
uses: actions/upload-artifact@v3
76+
uses: actions/upload-artifact@v4
7777
with:
7878
name: godot-python-${{ matrix.platform }}-${{ matrix.arch }}
79-
path: godot-python*.zip
79+
path: godot-python-${{ matrix.platform }}-${{ matrix.arch }}.zip
8080
retention-days: 30
8181

8282
- name: Upload artifacts (Windows)
8383
if: matrix.os == 'windows-latest'
84-
uses: actions/upload-artifact@v3
84+
uses: actions/upload-artifact@v4
8585
with:
8686
name: godot-python-${{ matrix.platform }}-${{ matrix.arch }}
8787
path: |
@@ -99,3 +99,13 @@ jobs:
9999
echo "Releasing artifact for windows"
100100
elif [[ "${{ matrix.os }}" == "macos-latest" ]]; then
101101
echo "Releasing artifact for macOS"
102+
merge:
103+
runs-on: ubuntu-latest
104+
needs: build
105+
steps:
106+
- name: Merge Artifacts
107+
uses: actions/upload-artifact/merge@v4
108+
with:
109+
name: godot-python
110+
pattern: godot-python-*
111+
delete-merged: true

readme.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# godot-python-extension
22

3-
> **Warning**
3+
> [!WARNING]
44
>
55
> This repository is a work in progress and should be considered experimental. It is not production ready.
66
>
@@ -28,7 +28,7 @@ This project can be thought as having three layers:
2828

2929
## Building
3030

31-
> **Note**
31+
> [!NOTE]
3232
>
3333
> Godot version 4.2 or later is required to build and load this extension.
3434
@@ -46,7 +46,7 @@ scons godot=<PATH_TO_GODOT_BINARY>
4646

4747
The path to the `godot` binary is needed to extract the `gdextension_interface.h` and `extension_api.json` files from the engine. The built extension shared object will be placed in `bin/`.
4848

49-
> **Note**
49+
> [!NOTE]
5050
>
5151
> Currently this project has only been tested on Linux with Python versions 3.11 and 3.12. Modifications to the [SConstruct](SConstruct) file may be needed for other platform configurations. Please submit issues and pull requests for any problems you run into.
5252

0 commit comments

Comments
 (0)