mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-18 23:33:12 +09:00
Test only the oldest and latest supported Node.js in CI
The middle version adds two jobs without catching anything the top and bottom of the range would miss. The host whitelist watcher now uses Set.difference, which every supported Node.js has. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
5cf14eb15b
commit
bb6ce06e5a
5 files changed
+30
-13
No files matched your search
@@ -29,9 +29,9 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
# To stay within the concurrent job limit, every Factorio version is
|
||||
# tested on the latest Node.js, and every other supported Node.js
|
||||
# version only with the latest Factorio. Coverage is performed on the
|
||||
# oldest supported Node.js.
|
||||
# tested on the latest Node.js, and the oldest supported Node.js only
|
||||
# with the latest Factorio. Versions in between are not tested.
|
||||
# Coverage is performed on the oldest supported Node.js.
|
||||
# Node.js release schedule: https://nodejs.org/en/about/releases/
|
||||
# Supported factorio versions are latest stable and one minor version before stable (even if from a previous major)
|
||||
node-version: [26.x]
|
||||
@@ -42,12 +42,6 @@ jobs:
|
||||
tests: [ctl, other]
|
||||
|
||||
include:
|
||||
- node-version: 24.x
|
||||
factorio-version: 2.1.17
|
||||
tests: ctl
|
||||
- node-version: 24.x
|
||||
factorio-version: 2.1.17
|
||||
tests: other
|
||||
- node-version: 22.x
|
||||
factorio-version: 2.1.17
|
||||
tests: ctl
|
||||
|
||||
@@ -1155,9 +1155,8 @@ export class FactorioServer extends events.EventEmitter<FactorioServerEvents> {
|
||||
}
|
||||
|
||||
const newWhitelist = new Set(newWhitelistJson);
|
||||
// Set.difference added in node v22 and so we can not use this due to v20 support
|
||||
const added = newWhitelistJson.filter(e => !this._whitelist.has(e));
|
||||
const removed = [...this._whitelist.values()].filter(e => !newWhitelist.has(e));
|
||||
const added = [...newWhitelist.difference(this._whitelist)];
|
||||
const removed = [...this._whitelist.difference(newWhitelist)];
|
||||
this._whitelist = newWhitelist;
|
||||
|
||||
this.emit("whitelist-change", added, removed);
|
||||
|
||||
@@ -4,5 +4,7 @@
|
||||
"exclude": ["src/**/*.browser.ts"],
|
||||
"compilerOptions": {
|
||||
"allowJs": true,
|
||||
// SubscriptionFilters.union clashes with the native Set.union
|
||||
"lib": ["es2023"],
|
||||
},
|
||||
}
|
||||
@@ -273,6 +273,28 @@ describe("host/server", function() {
|
||||
});
|
||||
});
|
||||
|
||||
describe("._watchWhitelist()", function() {
|
||||
it("should emit the added and removed players on change", async function() {
|
||||
const whitelistPath = path.join(writePath, "server-whitelist.json");
|
||||
await fs.mkdir(writePath, { recursive: true });
|
||||
await fs.writeFile(whitelistPath, JSON.stringify(["a", "b"]));
|
||||
server.enableWhitelist = true;
|
||||
server._whitelist = new Set(["a", "b"]);
|
||||
server._watchWhitelist();
|
||||
try {
|
||||
const waiter = events.once(server, "whitelist-change");
|
||||
await fs.writeFile(whitelistPath, JSON.stringify(["b", "c", "c"]));
|
||||
const [added, removed] = await waiter;
|
||||
assert.deepEqual(added, ["c"]);
|
||||
assert.deepEqual(removed, ["a"]);
|
||||
assert.deepEqual([...server._whitelist], ["b", "c"]);
|
||||
} finally {
|
||||
server._whitelistWatcher?.close();
|
||||
server.enableWhitelist = false;
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
describe(".fromOptions()", function() {
|
||||
it("should resolve the requested version", async function() {
|
||||
const found = await hostServer.FactorioServer.fromOptions(
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"extends": "./tsconfig.base.json",
|
||||
"compilerOptions": {
|
||||
"lib": ["es2023"],
|
||||
"lib": ["es2023", "es2025.collection"],
|
||||
"types": ["node"],
|
||||
"module": "nodenext",
|
||||
"moduleResolution": "node16",
|
||||
|
||||
Reference in new issue
Block a user