chore(release): update TrapOS endpoint and versions

This commit is contained in:
Guillaume ARM 2026-06-15 21:00:15 +02:00
parent db3f6a134b
commit 96e06041d9
13 changed files with 15 additions and 15 deletions

View File

@ -37,7 +37,7 @@ Use [`docs/README.md`](docs/README.md) as the entrypoint for CC:Tweaked, CraftOS
- Preserve `periphemu` guards used for CraftOS-PC emulation; see [`docs/craftos_pc_glossary.md`](docs/craftos_pc_glossary.md) for upstream emulator references. - Preserve `periphemu` guards used for CraftOS-PC emulation; see [`docs/craftos_pc_glossary.md`](docs/craftos_pc_glossary.md) for upstream emulator references.
- Global CraftOS-PC save data lives in `~/Library/Application Support/CraftOS-PC` on macOS and `~/.local/share/craftos-pc` on Linux. Repo launchers use local state instead: `.craftos/` for TrapOS and `.craftos-vanilla/` for vanilla CraftOS-PC. See [`docs/install-craftos-pc.md`](docs/install-craftos-pc.md). - Global CraftOS-PC save data lives in `~/Library/Application Support/CraftOS-PC` on macOS and `~/.local/share/craftos-pc` on Linux. Repo launchers use local state instead: `.craftos/` for TrapOS and `.craftos-vanilla/` for vanilla CraftOS-PC. See [`docs/install-craftos-pc.md`](docs/install-craftos-pc.md).
- TrapOS ships as packages, each described by `packages/<name>/ccpm.json` (`name`, `version`, `dependencies`, `files`, `autostart`); `packages/index.json` lists them. Source files stay in place — descriptors only reference them. To ship a new file, add it to the right package's `files` (and `autostart` if it is a server). `packages/trapos/ccpm.json` is the full OS meta-package. See [ADR-0010](docs/adrs/adr-0010-ccpm-package-manager.md). - TrapOS ships as packages, each described by `packages/<name>/ccpm.json` (`name`, `version`, `dependencies`, `files`, `autostart`); `packages/index.json` lists them. Source files stay in place — descriptors only reference them. To ship a new file, add it to the right package's `files` (and `autostart` if it is a server). `packages/trapos/ccpm.json` is the full OS meta-package. See [ADR-0010](docs/adrs/adr-0010-ccpm-package-manager.md).
- `install-trapos.lua` is the one-time wget bootstrap (public entry point `https://trapos.trapcloud.fr/install`). It installs `trapos-core`/`ccpm`, seeds the default `guillaumearm/cc-libs` registry as a `gitea` registry on `git.trapcloud.fr` tracking `master` (the only channel), then runs `ccpm update` + `ccpm install trapos` and `trapos-postinstall`. Pass `--cpm-only` to stop after the ccpm bootstrap. - `install-trapos.lua` is the one-time wget bootstrap (public entry point `https://os.trapcloud.fr/install`). It installs `trapos-core`/`ccpm`, seeds the default `guillaumearm/cc-libs` registry as a `gitea` registry on `git.trapcloud.fr` tracking `master` (the only channel), then runs `ccpm update` + `ccpm install trapos` and `trapos-postinstall`. Pass `--cpm-only` to stop after the ccpm bootstrap.
- `ccpm` (in `trapos-core`) is the package manager: `apis/libccpm.lua` is the testable core (factory with injectable `http`/`stateDir`/`installRoot`), `programs/ccpm.lua` the CLI. State: `/trapos/ccpm.json` (registries), `/trapos/ccpm.lock.json` (installed packages), and `/trapos/ccpm.cache.json` (available packages from `ccpm update`). Never use the word "manifest" in ccpm — it is reserved for the OS manifest. - `ccpm` (in `trapos-core`) is the package manager: `apis/libccpm.lua` is the testable core (factory with injectable `http`/`stateDir`/`installRoot`), `programs/ccpm.lua` the CLI. State: `/trapos/ccpm.json` (registries), `/trapos/ccpm.lock.json` (installed packages), and `/trapos/ccpm.cache.json` (available packages from `ccpm update`). Never use the word "manifest" in ccpm — it is reserved for the OS manifest.
- Add new servers to the relevant package `autostart` list as needed. - Add new servers to the relevant package `autostart` list as needed.

View File

@ -7,7 +7,7 @@ A small in-game operating system for ComputerCraft / CC:Tweaked, built around a
One command installs everything — it bootstraps `ccpm`, syncs the default One command installs everything — it bootstraps `ccpm`, syncs the default
registry (`guillaumearm/cc-libs`), and installs the full TrapOS: registry (`guillaumearm/cc-libs`), and installs the full TrapOS:
``` ```
wget run https://trapos.trapcloud.fr/install wget run https://os.trapcloud.fr/install
``` ```
When it finishes, run `sandbox --help` to get started, or `trapos-upgrade` to When it finishes, run `sandbox --help` to get started, or `trapos-upgrade` to
@ -16,7 +16,7 @@ update later.
Install only the package manager (no full OS) with `--cpm-only`, then Install only the package manager (no full OS) with `--cpm-only`, then
cherry-pick packages yourself: cherry-pick packages yourself:
``` ```
wget run https://trapos.trapcloud.fr/install --cpm-only wget run https://os.trapcloud.fr/install --cpm-only
ccpm update ccpm update
ccpm install trapos-net ccpm install trapos-net
ccpm install trapos-ui ccpm install trapos-ui

View File

@ -1,5 +1,5 @@
local DEFAULT_INSTALLER_LABEL = 'TrapOS Installer'; local DEFAULT_INSTALLER_LABEL = 'TrapOS Installer';
local DEFAULT_INSTALL_URL = 'https://trapos.trapcloud.fr/install'; local DEFAULT_INSTALL_URL = 'https://os.trapcloud.fr/install';
local DEFAULT_SETTINGS_SOURCE_PATH = '/.settings'; local DEFAULT_SETTINGS_SOURCE_PATH = '/.settings';
local function writeFile(path, body) local function writeFile(path, body)

View File

@ -13,7 +13,7 @@ Accepted
The beta/stable two-channel model has been retired now that `next` is merged into The beta/stable two-channel model has been retired now that `next` is merged into
`master`: `master` is the only channel. The `wget` bootstrap is renamed `master`: `master` is the only channel. The `wget` bootstrap is renamed
`install-ccpm.lua``install-trapos.lua` (public entry point `install-ccpm.lua``install-trapos.lua` (public entry point
`https://trapos.trapcloud.fr/install`) and now installs the **full OS** in one shot — `https://os.trapcloud.fr/install`) and now installs the **full OS** in one shot —
it bootstraps `ccpm`, then runs `ccpm update` + `ccpm install trapos` and a it bootstraps `ccpm`, then runs `ccpm update` + `ccpm install trapos` and a
`trapos-postinstall` welcome. Pass `--cpm-only` to stop after the ccpm bootstrap. The `trapos-postinstall` welcome. Pass `--cpm-only` to stop after the ccpm bootstrap. The
persisted `branch` field is always `master`; the `--beta` opt-in and its confirmation persisted `branch` field is always `master`; the `--beta` opt-in and its confirmation

View File

@ -7,7 +7,7 @@ Follow this order while playing.
On the ComputerCraft computer: On the ComputerCraft computer:
```sh ```sh
wget run https://trapos.trapcloud.fr/install wget run https://os.trapcloud.fr/install
``` ```
If the computer asks to reboot, reboot it. If the computer asks to reboot, reboot it.

View File

@ -17,7 +17,7 @@ CC Computer
On a fresh CC computer: On a fresh CC computer:
``` ```
wget run https://trapos.trapcloud.fr/install wget run https://os.trapcloud.fr/install
``` ```
## 1. Start `opencode serve` ## 1. Start `opencode serve`

View File

@ -1,6 +1,6 @@
{ {
"name": "TrapOS", "name": "TrapOS",
"version": "0.9.6", "version": "0.10.0",
"branch": "master", "branch": "master",
"packages": [ "packages": [
"trapos" "trapos"

View File

@ -1,6 +1,6 @@
{ {
"packages": { "packages": {
"trapos-core": "0.7.0", "trapos-core": "0.8.0",
"trapos-test": "0.2.1", "trapos-test": "0.2.1",
"trapos-boot": "0.4.0", "trapos-boot": "0.4.0",
"trapos-net": "0.3.0", "trapos-net": "0.3.0",
@ -8,6 +8,6 @@
"trapos-ai": "0.7.0", "trapos-ai": "0.7.0",
"trapos-sandbox": "0.3.0", "trapos-sandbox": "0.3.0",
"trapos-sandbox-legacy": "0.3.0", "trapos-sandbox-legacy": "0.3.0",
"trapos": "0.9.6" "trapos": "0.10.0"
} }
} }

View File

@ -1,6 +1,6 @@
{ {
"name": "trapos-core", "name": "trapos-core",
"version": "0.7.0", "version": "0.8.0",
"description": "TrapOS base: package manager, event loop, upgrade and event tools", "description": "TrapOS base: package manager, event loop, upgrade and event tools",
"dependencies": [], "dependencies": [],
"files": [ "files": [

View File

@ -1,6 +1,6 @@
{ {
"name": "trapos", "name": "trapos",
"version": "0.9.6", "version": "0.10.0",
"description": "TrapOS full install meta-package", "description": "TrapOS full install meta-package",
"dependencies": [ "dependencies": [
"trapos-boot", "trapos-boot",

View File

@ -1,6 +1,6 @@
local createVersion = require('/apis/libversion'); local createVersion = require('/apis/libversion');
local DEFAULT_SANDBOX_URL = 'wss://trapos.trapcloud.fr'; local DEFAULT_SANDBOX_URL = 'wss://os.trapcloud.fr';
local SANDBOX_URL_SETTING = 'sandbox.url'; local SANDBOX_URL_SETTING = 'sandbox.url';
local SANDBOX_PASSWORD_SETTING = 'sandbox.password'; local SANDBOX_PASSWORD_SETTING = 'sandbox.password';

View File

@ -81,7 +81,7 @@ testlib.test('buildAutorun copies settings before wget and no reboot', function(
local body = installer.buildAutorun(); local body = installer.buildAutorun();
local sentinel = string.find(body, "fs.exists('/trapos')", 1, true); local sentinel = string.find(body, "fs.exists('/trapos')", 1, true);
local label = string.find(body, 'TrapOS Installer', 1, true); local label = string.find(body, 'TrapOS Installer', 1, true);
local url = string.find(body, 'https://trapos.trapcloud.fr/install', 1, true); local url = string.find(body, 'https://os.trapcloud.fr/install', 1, true);
local copy = string.find(body, "fs.copy(src, '/.settings')", 1, true); local copy = string.find(body, "fs.copy(src, '/.settings')", 1, true);
local wget = string.find(body, "shell.run('wget', 'run', INSTALL_URL)", 1, true); local wget = string.find(body, "shell.run('wget', 'run', INSTALL_URL)", 1, true);

View File

@ -2,7 +2,7 @@ local createLibTest = require('/apis/libtest');
local testlib = createLibTest({ ... }); local testlib = createLibTest({ ... });
local DEFAULT_SANDBOX_URL = 'wss://trapos.trapcloud.fr'; local DEFAULT_SANDBOX_URL = 'wss://os.trapcloud.fr';
local function fakeSettings(values) local function fakeSettings(values)
return { return {