Compare commits

..

4 commits

Author SHA1 Message Date
marked
a969297e10 Sync to upstream Jecs 2025-03-02 18:30:14 +00:00
marked
849d2f361a Add check before trying to merge PR 2025-03-02 19:29:28 +01:00
marked
9d968eaa8b Fix typo 2025-03-02 19:27:00 +01:00
3a4871916f Sync to upstream Jecs (#6)
Reviewed-on: #6
2025-03-02 19:16:28 +01:00
7 changed files with 14 additions and 11 deletions

View file

@ -96,6 +96,9 @@ jobs:
token: ${{ secrets.privileged_forgejo_token }} token: ${{ secrets.privileged_forgejo_token }}
- name: Merge Pull Request - name: Merge Pull Request
shell: bash
run: | run: |
if [ ! -z "${{ steps.create_pull_request.outputs.pull-request-number }}" ]; then
fj --host git.devmarked.win auth add-key marked ${{ secrets.privileged_forgejo_token }} fj --host git.devmarked.win auth add-key marked ${{ secrets.privileged_forgejo_token }}
fj --host git.devmarked.win pr merge --method squash "${{ steps.create_pull_request.outputs.pull-request-number }}" fj --host git.devmarked.win pr merge --method squash "${{ steps.create_pull_request.outputs.pull-request-number }}"
fi

View file

@ -1,2 +1,2 @@
modified = ["README.md", "LICENSE", ".luaurc", "CHANGELOG.md", "jecs.luau"] modified = ["README.md", "LICENSE", ".luaurc", "CHANGELOG.md", "jecs.luau"]
version = "0.5.5-nightly.20250302T181602Z" version = "0.5.5-nightly.20250302T183002Z"

View file

@ -2,8 +2,8 @@ authors = ["jecs authors"]
includes = ["init.luau", "pesde.toml", "README.md", "CHANGELOG.md", "LICENSE", ".luaurc"] includes = ["init.luau", "pesde.toml", "README.md", "CHANGELOG.md", "LICENSE", ".luaurc"]
license = "MIT" license = "MIT"
name = "marked/jecs_nightly" name = "marked/jecs_nightly"
repository = "https://git.devmarked.win/jecs-nightly" repository = "https://git.devmarked.win/marked/jecs-nightly"
version = "0.5.5-nightly.20250302T181602Z" version = "0.5.5-nightly.20250302T183002Z"
[indices] [indices]
default = "https://github.com/daimond113/pesde-index" default = "https://github.com/daimond113/pesde-index"

View file

@ -1,2 +1,2 @@
passed = true passed = true
timestamp = "20250302T181603Z" timestamp = "20250302T183004Z"

View file

@ -1,6 +1,6 @@
 8 us  3 kB│ delete children of entity 8.0 us  3 kB│ delete children of entity
8.9 us  2 kB│ remove friends of entity 8.9 us  2 kB│ remove friends of entity
331 ns  10  B│ simple deletion of entity 324 ns  0  B│ simple deletion of entity
removing removing
archetype archetype
PASS│  PASS│ 
@ -110,5 +110,5 @@ removing
PASS│ #2 PASS│ #2
PASS│ #3 PASS│ #3
68/68 test cases passed in 30.962 ms. 68/68 test cases passed in 31.690 ms.
0 fails 0 fails

View file

@ -5,4 +5,4 @@ license = "MIT"
name = "mark-marks/jecs-nightly" name = "mark-marks/jecs-nightly"
realm = "shared" realm = "shared"
registry = "https://github.com/UpliftGames/wally-index" registry = "https://github.com/UpliftGames/wally-index"
version = "0.5.5-nightly.20250302T181602Z" version = "0.5.5-nightly.20250302T183002Z"

View file

@ -14,7 +14,7 @@ local function make_pesde_manifest(version: string, scope: string): types.PesdeM
name = scope, name = scope,
version = version, version = version,
authors = { "jecs authors" }, authors = { "jecs authors" },
repository = "https://git.devmarked.win/jecs-nightly", repository = "https://git.devmarked.win/marked/jecs-nightly",
license = "MIT", license = "MIT",
includes = { includes = {
"init.luau", "init.luau",