Skip to content

Commit 9217727

Browse files
authored
Merge branch 'makspll:main' into main
2 parents c301aad + 5108fbb commit 9217727

File tree

240 files changed

+92496
-42025
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

240 files changed

+92496
-42025
lines changed

.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
**/target
2+
**/Cargo.lock

.gitattributes

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
crates/bevy_script_api/providers/*.rs linguist-generated
2-
crates/bevy_script_api/providers/*.rs -diff -merge
1+
crates/bindings/**/* linguist-generated
2+
crates/bindings/**/* -diff -merge

.github/workflows/bevy_mod_scripting.yml

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
base: main
4545
filters: |
4646
src:
47+
- 'bindings/**'
4748
- 'src/**'
4849
- 'crates/**'
4950
- 'examples/**'
@@ -83,7 +84,7 @@ jobs:
8384
- name: Check if fork
8485
id: check-fork
8586
run: |
86-
if [ "${{ github.repository }}" != "${{ github.event.pull_request.head.repo.full_name }}" ]; then
87+
if [ "${{ github.event_name }}" == "pull_request" && "${{ github.repository }}" != "${{ github.event.pull_request.head.repo.full_name }}" ]; then
8788
echo "This is a forked repository."
8889
echo "is_fork=true" >> $GITHUB_OUTPUT
8990
else
@@ -124,7 +125,15 @@ jobs:
124125
if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && (matrix.run_args.run_on_forks || needs.check-is-fork.outputs.is_fork != 'true') }}
125126
with:
126127
toolchain: stable
127-
override: true
128+
override: false
129+
- name: Print versions
130+
if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && (matrix.run_args.run_on_forks || needs.check-is-fork.outputs.is_fork != 'true') }}
131+
run: |
132+
echo "Rust version: $(rustc --version)"
133+
echo "Clippy version: $(cargo clippy --version)"
134+
echo "Active toolchain: $(rustup show active-toolchain)"
135+
continue-on-error: true
136+
128137
- name: Rust Cache
129138
if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && (matrix.run_args.run_on_forks || needs.check-is-fork.outputs.is_fork != 'true') }}
130139
uses: Swatinem/rust-cache@v2.7.7
@@ -178,4 +187,19 @@ jobs:
178187
sed -n 's/.*pull\/\([0-9]*\).*/\1/p' pr.txt > pr_number.txt
179188
PRNUMBER=$(cat pr_number.txt)
180189
gh pr merge $PRNUMBER --squash
190+
fi
191+
192+
rollup-check:
193+
name: Required Checks Successful
194+
needs: [check]
195+
runs-on: ubuntu-latest
196+
if: ${{ always() }}
197+
steps:
198+
- name: Check if all jobs succeeded
199+
run: |
200+
if [[ "${{ needs.check.result }}" != "success" ]]; then
201+
echo "One or more checks failed. See detailed job results above."
202+
exit 1
203+
else
204+
echo "All checks passed successfully!"
181205
fi
Lines changed: 44 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,59 @@
1-
on:
2-
workflow_dispatch:
3-
1+
name: Build and Push Docker Image
42

5-
env:
6-
REGISTRY: ghcr.io
7-
IMAGE_NAME: bevy-mod-scripting
3+
on:
4+
workflow_dispatch: # Allow manual triggering
85

96
jobs:
10-
build-runner-image:
7+
docker:
8+
runs-on: ubuntu-latest
119
permissions:
1210
contents: read
1311
packages: write
14-
runs-on: ubuntu-latest
15-
name: Build multi-platform Docker image
16-
outputs:
17-
image: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.tags }}
12+
1813
steps:
19-
- uses: actions/checkout@v4
20-
- uses: docker/setup-qemu-action@v3
21-
- uses: docker/setup-buildx-action@v3
22-
- name: Docker meta
23-
id: meta
24-
uses: docker/metadata-action@v5
14+
- name: Checkout repository
15+
uses: actions/checkout@v4
16+
with:
17+
submodules: 'recursive'
18+
19+
- name: Set up Docker Buildx
20+
uses: docker/setup-buildx-action@v3
21+
22+
- name: Set up QEMU
23+
uses: docker/setup-qemu-action@v3
2524
with:
26-
images: |
27-
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
28-
- name: Login to GitHub Container Registry
25+
platforms: 'arm64,amd64'
26+
27+
- name: Login to DockerHub
28+
if: github.event_name != 'pull_request'
2929
uses: docker/login-action@v3
3030
with:
31-
registry: ghcr.io
32-
username: ${{ github.actor }}
33-
password: ${{ secrets.GITHUB_TOKEN }}
34-
- uses: docker/build-push-action@v5
31+
username: ${{ secrets.DOCKERHUB_USER }}
32+
password: ${{ secrets.DOCKERHUB_TOKEN }}
33+
34+
- name: Extract metadata for Docker
35+
id: meta
36+
uses: docker/metadata-action@v5
37+
with:
38+
images: makspll/bevy_mod_scripting
39+
flavor: |
40+
prefix=xtask-
41+
tags: |
42+
type=ref,event=branch
43+
type=ref,event=pr
44+
type=semver,pattern={{version}}
45+
type=semver,pattern={{major}}.{{minor}}
46+
type=sha,format=short
47+
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
48+
49+
- name: Build and push Docker image
50+
uses: docker/build-push-action@v5
3551
with:
3652
context: .
37-
file: ./crates/xtask/Dockerfile
53+
file: ./Dockerfile
3854
platforms: linux/amd64,linux/arm64
39-
cache-from: type=gha
40-
cache-to: type=gha,mode=max
55+
push: true
4156
tags: ${{ steps.meta.outputs.tags }}
4257
labels: ${{ steps.meta.outputs.labels }}
58+
cache-from: type=gha
59+
cache-to: type=gha,mode=max

.github/workflows/pr-titles.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
docs
2929
refactor
3030
perf
31+
changed
3132
3233
scopes: |
3334
ladfile

.github/workflows/synchronize_bindings.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
- name: Generate Bindings
2727
run: |
2828
cargo xtask codegen
29+
cargo fmt
2930
- name: Check for changes and create diff
3031
id: check_changes
3132
run: |

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [0.15.1](https://github.com/makspll/bevy_mod_scripting/compare/v0.15.0...v0.15.1) - 2025-08-18
11+
12+
### Changed
13+
14+
- Remove asset_path field from ScriptAsset. ([#450](https://github.com/makspll/bevy_mod_scripting/pull/450))
15+
16+
### Fixed
17+
18+
- "luau" extension regression ([#453](https://github.com/makspll/bevy_mod_scripting/pull/453))
19+
1020
## [0.15.0](https://github.com/makspll/bevy_mod_scripting/compare/v0.14.0...v0.15.0) - 2025-08-14
1121

1222
### Added

0 commit comments

Comments
 (0)