diff options
| author | Sho Sakuma <me@m1sk9.dev> | 2026-08-30 14:36:35 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-08-30 14:36:35 +0900 |
| commit | c9fc607df4c20b840d804ba6d8cfcfd8750a45c7 (patch) | |
| tree | 83de49ac98b2e6bf49783278a096304c7be9179c /website/src | |
| parent | 44132f3a73651fbd334a314fbc4ab47f5f1bbd5b (diff) | |
| parent | adb97b712043253afdfb8debcb413a676b7d9c2f (diff) | |
| download | LunaticChat-c9fc607df4c20b840d804ba6d8cfcfd8750a45c7.tar.gz LunaticChat-c9fc607df4c20b840d804ba6d8cfcfd8750a45c7.tar.bz2 LunaticChat-c9fc607df4c20b840d804ba6d8cfcfd8750a45c7.zip | |
Merge pull request #295 from m1sk9/fix/nightly-tags
fix: mark nightly builds with a `-nightly.<hash>` version and flatten CI artifacts
Diffstat (limited to 'website/src')
| -rw-r--r-- | website/src/docs/developers/resource.md | 6 | ||||
| -rw-r--r-- | website/src/docs/features/admin.md | 1 | ||||
| -rw-r--r-- | website/src/ja/docs/developers/resource.md | 6 | ||||
| -rw-r--r-- | website/src/ja/docs/features/admin.md | 1 |
4 files changed, 10 insertions, 4 deletions
diff --git a/website/src/docs/developers/resource.md b/website/src/docs/developers/resource.md index 543365d..67e6d57 100644 --- a/website/src/docs/developers/resource.md +++ b/website/src/docs/developers/resource.md @@ -14,7 +14,9 @@ A Gradle multi-module setup shares `engine` while building and releasing Paper / - `platform-velocity` — `version = velocityVersion`. `api(project(":engine"))`. velocity-api as `compileOnly`. Output is **`LunaticChat-<ver>-velocity.jar`** (distinguished by classifier) - `dokka` — aggregates engine/paper/velocity and includes the README in the HTML -Both platforms' `processResources` compute `version` / `gitCommitHash` / `channel` from the git short hash and `isNightly`, and token-expand them into `paper-plugin.yml` / `velocity-plugin.json` and `build-info.properties`. +Both platforms derive their version from `isNightly`: with `-PisNightly=true` the base version gains a `-nightly.<git short hash>` suffix, so a development build is never mistakable for the release of the same base version (`LunaticChat-1.3.0-nightly.44132f3.jar`). Without the flag the version stays the bare `paperVersion` / `velocityVersion`, which is what the release workflows build. + +`processResources` then token-expands `version` / `gitCommitHash` / `channel` into `paper-plugin.yml` / `velocity-plugin.json` and `build-info.properties`. ## Independent versioning @@ -44,7 +46,7 @@ The release target switches based on the tag pattern. `ci.yaml` runs on push to main / PR / manual dispatch. -- `build_plugin` — ktlintCheck → test + jacocoTestReport → upload to Codecov → nightly shadowJar (`-PisNightly=true`) → retain artifacts +- `build_plugin` — ktlintCheck → test + jacocoTestReport → upload to Codecov → nightly shadowJar (`-PisNightly=true`) → retain artifacts as `LunaticChat-paper-<sha>` / `LunaticChat-velocity-<sha>` (one per platform, each holding the JAR at the archive root) - `build_dokka` / `deploy_dokka` — generate Dokka → deploy to GitHub Pages (main push only) - `build_docs` — format/lint/build `website/` with bun → deploy to Cloudflare Workers (wrangler) (main push only) diff --git a/website/src/docs/features/admin.md b/website/src/docs/features/admin.md index 531f2e0..aa298ba 100644 --- a/website/src/docs/features/admin.md +++ b/website/src/docs/features/admin.md @@ -72,6 +72,7 @@ checkForUpdates: true Builds produced from the `main` branch outside of a release are marked as nightly, and the plugin says so rather than letting it go unnoticed. +- The version carries a `-nightly.<commit hash>` suffix (`1.3.0-nightly.44132f3`), so the JAR file name, `/plugins` and `/lc status` all tell it apart from the 1.3.0 release - Every player is warned on join that the build may be unstable, along with a pointer to GitHub Issues - `/lc status` shows the same warning, and displays the release channel in yellow instead of green diff --git a/website/src/ja/docs/developers/resource.md b/website/src/ja/docs/developers/resource.md index 0eea858..7bcc6c9 100644 --- a/website/src/ja/docs/developers/resource.md +++ b/website/src/ja/docs/developers/resource.md @@ -14,7 +14,9 @@ Gradle マルチモジュール構成で,engine を共有しつつ Paper / Vel - `platform-velocity` — `version = velocityVersion`.`api(project(":engine"))`.velocity-api を `compileOnly`.成果物は **`LunaticChat-<ver>-velocity.jar`** (classifier で区別) - `dokka` — engine/paper/velocity を集約し HTML に README を include -両プラットフォームの `processResources` は git short hash と `isNightly` から `version` / `gitCommitHash` / `channel` を算出し,`paper-plugin.yml` / `velocity-plugin.json` と `build-info.properties` にトークン展開します. +両プラットフォームのバージョンは `isNightly` から導出されます.`-PisNightly=true` を付けるとベースバージョンに `-nightly.<git short hash>` が付き (`LunaticChat-1.3.0-nightly.44132f3.jar`),開発ビルドを同じベースバージョンのリリースと取り違えることがなくなります.フラグを付けない場合は `paperVersion` / `velocityVersion` そのままで,リリースワークフローはこちらをビルドします. + +`processResources` はこの `version` と `gitCommitHash` / `channel` を `paper-plugin.yml` / `velocity-plugin.json` と `build-info.properties` にトークン展開します. ## 独立バージョニング @@ -44,7 +46,7 @@ Paper と Velocity は別々のバージョン番号を持ち,独立にリリã `ci.yaml` は main への push / PR / 手動実行で動きます. -- `build_plugin` — ktlintCheck → test + jacocoTestReport → Codecov アップロード → nightly shadowJar (`-PisNightly=true`) → artifact 保持 +- `build_plugin` — ktlintCheck → test + jacocoTestReport → Codecov アップロード → nightly shadowJar (`-PisNightly=true`) → `LunaticChat-paper-<sha>` / `LunaticChat-velocity-<sha>` としてプラットフォームごとに artifact 保持 (JAR は artifact 直下) - `build_dokka` / `deploy_dokka` — Dokka 生成 → GitHub Pages デプロイ (main push のみ) - `build_docs` — `website/` を bun で format/lint/build → Cloudflare Workers (wrangler) へデプロイ (main push のみ) diff --git a/website/src/ja/docs/features/admin.md b/website/src/ja/docs/features/admin.md index f6c86b8..17e08f8 100644 --- a/website/src/ja/docs/features/admin.md +++ b/website/src/ja/docs/features/admin.md @@ -72,6 +72,7 @@ checkForUpdates: true リリース以外で `main` ブランチから作られたビルドは nightly として扱われ,プラグインがその旨を明示します. +- バージョンに `-nightly.<コミットハッシュ>` が付き (`1.3.0-nightly.44132f3`),JAR のファイル名・`/plugins`・`/lc status` のいずれからも 1.3.0 リリースと区別できます - すべてのプレイヤーに対して,ログイン時に不安定な可能性があることと GitHub Issues への案内が警告として表示されます - `/lc status` にも同じ警告が表示され,リリースチャンネルが緑ではなく黄色で表示されます |
