Skip to content

Commit a8be74c

Browse files
committed
fix condition
1 parent eca2445 commit a8be74c

File tree

2 files changed

+23
-11
lines changed

2 files changed

+23
-11
lines changed

.github/workflows/bevy_mod_scripting.yml

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,20 @@ jobs:
7575
jq -c . matrix.json > matrix-one-line.json
7676
echo "matrix=$(cat matrix-one-line.json)" >> $GITHUB_OUTPUT
7777
78+
check-is-fork:
79+
outputs:
80+
is_fork: ${{ steps.check-fork.outputs.is_fork }}
81+
steps:
82+
- name: Check if fork
83+
id: check-fork
84+
run: |
85+
if [ "${{ github.repository }}" != "${{ github.event.pull_request.head.repo.full_name }}" ]; then
86+
echo "is_fork=true" >> $GITHUB_OUTPUT
87+
else
88+
echo "is_fork=false" >> $GITHUB_OUTPUT
89+
fi
7890
check:
79-
needs: [check-needs-run, generate-job-matrix]
91+
needs: [check-needs-run, generate-job-matrix, check-is-fork]
8092
permissions:
8193
pull-requests: write
8294
contents: write
@@ -103,49 +115,49 @@ jobs:
103115
# # run: |
104116
# # sudo rm -rf /usr/share/dotnet; sudo rm -rf /opt/ghc; sudo rm -rf "/usr/local/share/boost"; sudo rm -rf "$AGENT_TOOLSDIRECTORY"
105117
- name: Checkout
106-
if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && matrix.run_args.run_on_forks == 'true' }}
118+
if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && (matrix.run_args.run_on_forks == 'true' && needs.check-is-fork.is_fork) }}
107119
uses: actions/checkout@v4
108120
- uses: actions-rs/toolchain@v1
109-
if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && matrix.run_args.run_on_forks == 'true' }}
121+
if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && (matrix.run_args.run_on_forks == 'true' && needs.check-is-fork.is_fork) }}
110122
with:
111123
toolchain: stable
112124
override: true
113125
- name: Rust Cache
114-
if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && matrix.run_args.run_on_forks == 'true' }}
126+
if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && (matrix.run_args.run_on_forks == 'true' && needs.check-is-fork.is_fork) }}
115127
uses: Swatinem/[email protected]
116128
with:
117129
# reasoning: we want to cache xtask, most of the jobs in the matrix will be sped up a good bit thanks to that
118130
save-if: ${{ github.ref == 'refs/heads/main' }}
119131
cache-all-crates: true
120132

121133
- name: Setup
122-
if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && matrix.run_args.run_on_forks == 'true' }}
134+
if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && (matrix.run_args.run_on_forks == 'true' && needs.check-is-fork.is_fork) }}
123135
run: |
124136
cargo xtask init
125137
126138
- name: Setup GPU Drivers
127-
if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && matrix.run_args.run_on_forks == 'true' && matrix.run_args.requires_gpu }}
139+
if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && (matrix.run_args.run_on_forks == 'true' && needs.check-is-fork.is_fork) && matrix.run_args.requires_gpu }}
128140
run: |
129141
sudo add-apt-repository ppa:kisak/turtle -y
130142
sudo apt-get install --no-install-recommends libxkbcommon-x11-0 xvfb libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers
131143
- name: Check
132-
if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && matrix.run_args.run_on_forks == 'true' && !matrix.run_args.requires_gpu }}
144+
if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && (matrix.run_args.run_on_forks == 'true' && needs.check-is-fork.is_fork) && !matrix.run_args.requires_gpu }}
133145
run: |
134146
${{ matrix.run_args.command }}
135147
- name: Check With virtual X11 server
136-
if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && matrix.run_args.run_on_forks == 'true' && matrix.run_args.requires_gpu }}
148+
if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && (matrix.run_args.run_on_forks == 'true' && needs.check-is-fork.is_fork) && matrix.run_args.requires_gpu }}
137149
run: |
138150
xvfb-run ${{ matrix.run_args.command }}
139151
140152
- name: Upload coverage artifact
141-
if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && matrix.run_args.run_on_forks == 'true' && matrix.run_args.generates_coverage }}
153+
if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && (matrix.run_args.run_on_forks == 'true' && needs.check-is-fork.is_fork) && matrix.run_args.generates_coverage }}
142154
uses: actions/upload-artifact@v4
143155
with:
144156
name: code-coverage-report
145157
path: target/coverage/html/
146158

147159
- name: Update coverage badge
148-
if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && matrix.run_args.run_on_forks == 'true' && matrix.run_args.generates_coverage }}
160+
if: ${{ needs.check-needs-run.outputs.any-changes == 'true' && (matrix.run_args.run_on_forks == 'true' && needs.check-is-fork.is_fork) && matrix.run_args.generates_coverage }}
149161
continue-on-error: true
150162
run: |
151163
git checkout -b chore/_update-coverage-badge || git checkout chore/_update-coverage-badge

crates/bevy_mod_scripting_functions/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ impl Plugin for ScriptFunctionsPlugin {
1414
register_bevy_bindings(app);
1515
register_core_functions(app);
1616

17-
// TODO: if bevy ever does this itself we should remove this.
17+
// TODO: if bevy ever does this itself we should remove this
1818
app.world_mut().register_component::<Parent>();
1919
app.world_mut().register_component::<Children>();
2020
}

0 commit comments

Comments
 (0)