Merge branch 'main' of https://github.com/makspll/bevy_mod_scripting

# Conflicts:
#	badges/coverage.svg

Author: pro470

.cargo/config.toml

@@ -2,4 +2,4 @@
 TARGET_DIR = { value = "target", relative = true }
 
 [alias]
-xtask = "run --package xtask --"
+xtask = "run --manifest-path xtask/Cargo.toml --package xtask --"

.dockerignore

@@ -0,0 +1,2 @@
+**/target
+**/Cargo.lock

.gitattributes

@@ -1,2 +1,2 @@
-crates/bevy_script_api/providers/*.rs linguist-generated
-crates/bevy_script_api/providers/*.rs -diff -merge
+crates/bindings/**/* linguist-generated
+crates/bindings/**/* -diff -merge

.github/workflows/bencher_on_pr_or_fork.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   benchmark_fork_pr_branch:
-    name: Run Fork PR Benchmarks
+    name: Run PR Benchmarks
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.github/workflows/bevy_mod_scripting.yml

@@ -44,6 +44,7 @@ jobs:
           base: main
           filters: |
             src:
+              - 'bindings/**'
               - 'src/**'
               - 'crates/**'
               - 'examples/**'
@@ -75,8 +76,23 @@ jobs:
           jq -c . matrix.json > matrix-one-line.json
           echo "matrix=$(cat matrix-one-line.json)" >> $GITHUB_OUTPUT
 
+  check-is-fork:
+    runs-on: ubuntu-latest
+    outputs:
+      is_fork: ${{ steps.check-fork.outputs.is_fork }}
+    steps:
+      - name: Check if fork
+        id: check-fork
+        run: | 
+          if [ "${{ github.event_name }}" == "pull_request" && "${{ github.repository }}" != "${{ github.event.pull_request.head.repo.full_name }}" ]; then
+            echo "This is a forked repository."
+            echo "is_fork=true" >> $GITHUB_OUTPUT
+          else
+            echo "This is not a forked repository."
+            echo "is_fork=false" >> $GITHUB_OUTPUT
+          fi
   check:  
-    needs: [check-needs-run, generate-job-matrix]
+    needs: [check-needs-run, generate-job-matrix, check-is-fork]
     permissions:
       pull-requests: write
       contents: write
@@ -103,49 +119,57 @@ jobs:
       # #   run: |
       # #     sudo rm -rf /usr/share/dotnet; sudo rm -rf /opt/ghc; sudo rm -rf "/usr/local/share/boost"; sudo rm -rf "$AGENT_TOOLSDIRECTORY"
       - name: Checkout
-        if: ${{ needs.check-needs-run.outputs.any-changes == 'true' }}
+        if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && (matrix.run_args.run_on_forks || needs.check-is-fork.outputs.is_fork != 'true') }}
         uses: actions/checkout@v4
       - uses: actions-rs/toolchain@v1
-        if: ${{ needs.check-needs-run.outputs.any-changes == 'true' }}
+        if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && (matrix.run_args.run_on_forks || needs.check-is-fork.outputs.is_fork != 'true') }}
         with:
           toolchain: stable
-          override: true
+          override: false 
+      - name: Print versions 
+        if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && (matrix.run_args.run_on_forks || needs.check-is-fork.outputs.is_fork != 'true') }}
+        run: |
+          echo "Rust version: $(rustc --version)"
+          echo "Clippy version: $(cargo clippy --version)"
+          echo "Active toolchain: $(rustup show active-toolchain)"
+        continue-on-error: true
+
       - name: Rust Cache
-        if: ${{ needs.check-needs-run.outputs.any-changes == 'true' }}
+        if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && (matrix.run_args.run_on_forks || needs.check-is-fork.outputs.is_fork != 'true') }}
         uses: Swatinem/[email protected]
         with:
           # reasoning: we want to cache xtask, most of the jobs in the matrix will be sped up a good bit thanks to that 
           save-if: ${{ github.ref == 'refs/heads/main' }}
           cache-all-crates: true
 
       - name: Setup
-        if: ${{ needs.check-needs-run.outputs.any-changes == 'true' }}
+        if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && (matrix.run_args.run_on_forks || needs.check-is-fork.outputs.is_fork != 'true') }}
         run: |
           cargo xtask init
 
       - name: Setup GPU Drivers
-        if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && matrix.run_args.requires_gpu }}
+        if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && (matrix.run_args.run_on_forks || needs.check-is-fork.outputs.is_fork != 'true') && matrix.run_args.requires_gpu }}
         run: |
           sudo add-apt-repository ppa:kisak/turtle -y
           sudo apt-get install --no-install-recommends libxkbcommon-x11-0 xvfb libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers
       - name: Check
-        if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && !matrix.run_args.requires_gpu }}
+        if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && (matrix.run_args.run_on_forks || needs.check-is-fork.outputs.is_fork != 'true') && !matrix.run_args.requires_gpu }}
         run: |
           ${{ matrix.run_args.command }}
       - name: Check With virtual X11 server
-        if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && matrix.run_args.requires_gpu }}
+        if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && (matrix.run_args.run_on_forks || needs.check-is-fork.outputs.is_fork != 'true') && matrix.run_args.requires_gpu }}
         run: |
           xvfb-run ${{ matrix.run_args.command }}
 
       - name: Upload coverage artifact
-        if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && matrix.run_args.generates_coverage }}
+        if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && (matrix.run_args.run_on_forks || needs.check-is-fork.outputs.is_fork != 'true') && matrix.run_args.generates_coverage }}
         uses: actions/upload-artifact@v4
         with:
           name: code-coverage-report
           path: target/coverage/html/
 
       - name: Update coverage badge
-        if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && matrix.run_args.generates_coverage }}
+        if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && (matrix.run_args.run_on_forks || needs.check-is-fork.outputs.is_fork != 'true') && matrix.run_args.generates_coverage }}
         continue-on-error: true
         run: |
           git checkout -b chore/_update-coverage-badge || git checkout chore/_update-coverage-badge
@@ -164,43 +188,18 @@ jobs:
             PRNUMBER=$(cat pr_number.txt)
             gh pr merge $PRNUMBER --squash
           fi
-  generate_bindings:
-    name: Bindings - Synchronise
-    permissions:
-      contents: write
-      pull-requests: write
+
+  rollup-check:
+    name: Required Checks Successful
+    needs: [check]
     runs-on: ubuntu-latest
+    if: ${{ always() }}
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        ref: ${{ github.head_ref || github.ref_name }}
-    - name: Rust Cache
-      if: ${{ needs.check-needs-run.outputs.any-changes == 'true' }}
-      uses: Swatinem/[email protected]
-      with:
-        # reasoning: we want to cache xtask, most of the jobs in the matrix will be sped up a good bit thanks to that 
-        save-if: ${{ github.ref == 'refs/heads/main' }}
-        cache-all-crates: true
-    - name: Setup Bot GitHub Credentials
-      run: |
-        git config user.name "github-actions[bot]"
-        git config user.email "41898282+github-actions[bot]@users.noreply.github.com" 
-    - name: Setup
-      run: |
-        cargo xtask init
-    - name: Generate Bindings
-      run: |
-        cargo xtask codegen
-    - name: Check for changes
-      id: check_changes
-      run: |
-        if [[ -n $(git status --porcelain) ]]; then
-            echo "changes=true" >> "$GITHUB_OUTPUT"; 
-        fi
-    - name: Commit Changes
-      if: steps.check_changes.outputs.changes
-      run: |
-        git add -A
-        git commit -m "chore(codegen): update bevy bindings"
-        git push
+      - name: Check if all jobs succeeded
+        run: |
+          if [[ "${{ needs.check.result }}" != "success" ]]; then
+            echo "One or more checks failed. See detailed job results above."
+            exit 1
+          else
+            echo "All checks passed successfully!"
+          fi

.github/workflows/build-ci-image.yml

@@ -1,42 +1,59 @@
-on:
-  workflow_dispatch:
-    
+name: Build and Push Docker Image
 
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: bevy-mod-scripting
+on:
+  workflow_dispatch:  # Allow manual triggering
 
 jobs:
-  build-runner-image:
+  docker:
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
-    runs-on: ubuntu-latest
-    name: Build multi-platform Docker image
-    outputs:
-      image: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.tags }}
+
     steps:
-      - uses: actions/checkout@v4
-      - uses: docker/setup-qemu-action@v3
-      - uses: docker/setup-buildx-action@v3
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
         with:
-          images: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-      - name: Login to GitHub Container Registry
+          platforms: 'arm64,amd64'
+
+      - name: Login to DockerHub
+        if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
         with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - uses: docker/build-push-action@v5
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Extract metadata for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: makspll/bevy_mod_scripting
+          flavor: |
+            prefix=xtask-
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=sha,format=short
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./crates/xtask/Dockerfile
+          file: ./Dockerfile
           platforms: linux/amd64,linux/arm64
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/pr-titles.yml

@@ -28,6 +28,7 @@ jobs:
             docs
             refactor
             perf
+            changed
 
           scopes: |
             ladfile

.github/workflows/synchronize_bindings.yml

@@ -0,0 +1,52 @@
+on:
+  pull_request:
+    types: [opened, reopened, edited, synchronize]
+
+name: Synchronize Bindings
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  generate_bindings:
+    name: Generate Diff
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Rust Cache
+      uses: Swatinem/[email protected]
+      with:
+        save-if: ${{ github.ref == 'refs/heads/main' }}
+        cache-all-crates: true
+    - name: Setup
+      run: |
+        cargo xtask init
+    - name: Generate Bindings
+      run: |
+        cargo xtask codegen
+        cargo fmt
+    - name: Check for changes and create diff
+      id: check_changes
+      run: |
+        if [[ -n $(git status --porcelain) ]]; then
+          echo "changes=true" >> "$GITHUB_OUTPUT"
+          git diff > bindings.diff
+          echo "Diff created:"
+          cat bindings.diff
+        else
+          echo "changes=false" >> "$GITHUB_OUTPUT"
+        fi
+    - name: Upload Diff Artifact
+      if: steps.check_changes.outputs.changes == 'true'
+      uses: actions/upload-artifact@v4
+      with:
+        name: bindings.diff
+        path: bindings.diff
+        retention-days: 1
+    - name: Upload GitHub Pull Request Event
+      uses: actions/upload-artifact@v4
+      with:
+        name: event-bindings.json
+        path: ${{ github.event_path }}

.github/workflows/synchronize_bindings_check_diff.yml

@@ -0,0 +1,49 @@
+on:
+  workflow_run:
+    workflows: [Synchronize Bindings]
+    types: [completed]
+
+name: Synchronize Bindings (Check Diff)
+
+permissions: write-all
+
+jobs:
+  apply_fork_bindings:
+    name: Apply Bindings (Fork)
+    runs-on: ubuntu-latest
+    if: github.event.workflow_run.conclusion == 'success'
+    env:
+      DIFF_ARTIFACT: bindings.diff
+      PR_EVENT: event-bindings.json
+    steps:
+    - name: Download Benchmark Results
+      uses: dawidd6/action-download-artifact@v6
+      with:
+        name: ${{ env.DIFF_ARTIFACT }}
+        run_id: ${{ github.event.workflow_run.id }}
+    - name: Download PR Event
+      uses: dawidd6/action-download-artifact@v6
+      with:
+        name: ${{ env.PR_EVENT }}
+        run_id: ${{ github.event.workflow_run.id }}
+    - name: Export PR Event Data
+      uses: actions/github-script@v6
+      with:
+        script: |
+          let fs = require('fs');
+          let prEvent = JSON.parse(fs.readFileSync(process.env.PR_EVENT, {encoding: 'utf8'}));
+          core.exportVariable("PR_HEAD", prEvent.pull_request.head.ref);
+          core.exportVariable("PR_BASE", prEvent.pull_request.base.ref);
+          core.exportVariable("PR_BASE_SHA", prEvent.pull_request.base.sha);
+          core.exportVariable("PR_NUMBER", prEvent.number);
+          core.exportVariable("HEAD_REPO", prEvent.pull_request.head.repo.full_name);
+          core.exportVariable("HEAD_REPO_URL", prEvent.pull_request.head.repo.git_url);
+    - name: Fail PR With URL
+      uses: actions/github-script@v6
+      with:
+        script: |
+          core.setFailed(`Running `cargo xtask codegen` produces changes in the bindings, please make sure to run this command locally and commit the changes to the PR.`);
+        
+
+
+        

.gitignore

@@ -15,6 +15,7 @@ assets/scripts/tlconfig.lua
 **.log
 **build/
 .html
+.idea/
 
 /assets/**/*.lad.json
-/docs/src/ladfiles/*.lad.json
+/docs/src/ladfiles/*.lad.json