diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 3d5968b..1371fa9 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -96,6 +96,9 @@ jobs: token: ${{ secrets.privileged_forgejo_token }} - name: Merge Pull Request + shell: bash run: | - 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 }}" + 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 pr merge --method squash "${{ steps.create_pull_request.outputs.pull-request-number }}" + fi diff --git a/jecs/build.txt b/jecs/build.txt index 4278973..1a1326e 100644 --- a/jecs/build.txt +++ b/jecs/build.txt @@ -1,2 +1,2 @@ modified = ["README.md", "LICENSE", ".luaurc", "CHANGELOG.md", "jecs.luau"] -version = "0.5.5-nightly.20250302T181602Z" +version = "0.5.5-nightly.20250302T183002Z" diff --git a/jecs/pesde.toml b/jecs/pesde.toml index 3eb9ee6..a97cd9e 100644 --- a/jecs/pesde.toml +++ b/jecs/pesde.toml @@ -2,8 +2,8 @@ authors = ["jecs authors"] includes = ["init.luau", "pesde.toml", "README.md", "CHANGELOG.md", "LICENSE", ".luaurc"] license = "MIT" name = "marked/jecs_nightly" -repository = "https://git.devmarked.win/jecs-nightly" -version = "0.5.5-nightly.20250302T181602Z" +repository = "https://git.devmarked.win/marked/jecs-nightly" +version = "0.5.5-nightly.20250302T183002Z" [indices] default = "https://github.com/daimond113/pesde-index" diff --git a/jecs/test.txt b/jecs/test.txt index 8a65a43..801f4fb 100644 --- a/jecs/test.txt +++ b/jecs/test.txt @@ -1,2 +1,2 @@ passed = true -timestamp = "20250302T181603Z" +timestamp = "20250302T183004Z" diff --git a/jecs/test_fulllog.txt b/jecs/test_fulllog.txt index d5c64dc..6ab3ca5 100644 --- a/jecs/test_fulllog.txt +++ b/jecs/test_fulllog.txt @@ -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 -331 ns  10  B│ simple deletion of entity +324 ns  0  B│ simple deletion of entity removing archetype PASS│  @@ -110,5 +110,5 @@ removing PASS│ #2 PASS│ #3 -68/68 test cases passed in 30.962 ms. +68/68 test cases passed in 31.690 ms. 0 fails diff --git a/jecs/wally.toml b/jecs/wally.toml index 0bf070a..e618e4c 100644 --- a/jecs/wally.toml +++ b/jecs/wally.toml @@ -5,4 +5,4 @@ license = "MIT" name = "mark-marks/jecs-nightly" realm = "shared" registry = "https://github.com/UpliftGames/wally-index" -version = "0.5.5-nightly.20250302T181602Z" +version = "0.5.5-nightly.20250302T183002Z" diff --git a/src/release.luau b/src/release.luau index 7fa6190..2579d77 100644 --- a/src/release.luau +++ b/src/release.luau @@ -14,7 +14,7 @@ local function make_pesde_manifest(version: string, scope: string): types.PesdeM name = scope, version = version, authors = { "jecs authors" }, - repository = "https://git.devmarked.win/jecs-nightly", + repository = "https://git.devmarked.win/marked/jecs-nightly", license = "MIT", includes = { "init.luau",