Skip to content

Commit d068625

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

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed

.github/workflows/build.yml

Lines changed: 16 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

@@ -64,6 +64,8 @@ jobs:
6464
run: |
6565
scons platform=${{ matrix.platform }} arch=${{ matrix.arch }} single_source=true
6666
67+
# Creating an archive explicitly preserves permissions in the artifact,
68+
# which upload-artifact doesn't. See https://github.com/actions/upload-artifact/issues/38
6769
- name: Create archive (Linux, macOS)
6870
if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
6971
run: |
@@ -73,15 +75,15 @@ jobs:
7375
7476
- name: Upload artifacts (Linux, macOS)
7577
if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
76-
uses: actions/upload-artifact@v3
78+
uses: actions/upload-artifact@v4
7779
with:
7880
name: godot-python-${{ matrix.platform }}-${{ matrix.arch }}
79-
path: godot-python*.zip
81+
path: godot-python-${{ matrix.platform }}-${{ matrix.arch }}.zip
8082
retention-days: 30
8183

8284
- name: Upload artifacts (Windows)
8385
if: matrix.os == 'windows-latest'
84-
uses: actions/upload-artifact@v3
86+
uses: actions/upload-artifact@v4
8587
with:
8688
name: godot-python-${{ matrix.platform }}-${{ matrix.arch }}
8789
path: |
@@ -99,3 +101,13 @@ jobs:
99101
echo "Releasing artifact for windows"
100102
elif [[ "${{ matrix.os }}" == "macos-latest" ]]; then
101103
echo "Releasing artifact for macOS"
104+
merge:
105+
runs-on: ubuntu-latest
106+
needs: build
107+
steps:
108+
- name: Merge Artifacts
109+
uses: actions/upload-artifact/merge@v4
110+
with:
111+
name: godot-python
112+
pattern: godot-python-*
113+
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)