mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-21 16:13:12 +09:00
Merge pull request #1022 from bbassie/chore/bump-deps
Bump pnpm, GitHub Actions and CI Factorio version
This commit is contained in:
7 files changed
+36
-35
No files matched your search
@@ -5,14 +5,14 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
|
|
||||||
env:
|
env:
|
||||||
EMMYLUA_CHECK_VERSION: "0.24.0"
|
EMMYLUA_CHECK_VERSION: "0.25.1"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
lint:
|
lint:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v7
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v7
|
||||||
with:
|
with:
|
||||||
node-version: lts/*
|
node-version: lts/*
|
||||||
- name: Generate Factorio typedefs
|
- name: Generate Factorio typedefs
|
||||||
|
|||||||
@@ -21,19 +21,19 @@ jobs:
|
|||||||
node-version: [24.x]
|
node-version: [24.x]
|
||||||
|
|
||||||
# Supported factorio versions are latest stable and one minor version before stable (even if from a previous major)
|
# Supported factorio versions are latest stable and one minor version before stable (even if from a previous major)
|
||||||
factorio-version: [1.1.110, 2.0.77, 2.1.8]
|
factorio-version: [1.1.110, 2.0.77, 2.1.17]
|
||||||
|
|
||||||
# Coverage is performed on the older of the supported node versions
|
# Coverage is performed on the older of the supported node versions
|
||||||
include:
|
include:
|
||||||
- node-version: 22.x
|
- node-version: 22.x
|
||||||
factorio-version: 2.1.8
|
factorio-version: 2.1.17
|
||||||
coverage: true
|
coverage: true
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v7
|
||||||
- uses: pnpm/action-setup@v4
|
- uses: pnpm/action-setup@v6
|
||||||
- name: Use Node.js ${{ matrix.node-version }}
|
- name: Use Node.js ${{ matrix.node-version }}
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v7
|
||||||
with:
|
with:
|
||||||
node-version: ${{ matrix.node-version }}
|
node-version: ${{ matrix.node-version }}
|
||||||
- name: Prepare and install
|
- name: Prepare and install
|
||||||
@@ -48,13 +48,13 @@ jobs:
|
|||||||
run: pnpm run ci-cover
|
run: pnpm run ci-cover
|
||||||
- name: Upload coverage to Codecov
|
- name: Upload coverage to Codecov
|
||||||
if: ${{ matrix.coverage }}
|
if: ${{ matrix.coverage }}
|
||||||
uses: codecov/codecov-action@v4
|
uses: codecov/codecov-action@v7
|
||||||
with:
|
with:
|
||||||
files: ./coverage/lcov.info
|
files: ./coverage/lcov.info
|
||||||
token: ${{ secrets.CODECOV_TOKEN }}
|
token: ${{ secrets.CODECOV_TOKEN }}
|
||||||
- name: Upload test logs for debugging
|
- name: Upload test logs for debugging
|
||||||
if: ${{ !cancelled() }}
|
if: ${{ !cancelled() }}
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v7
|
||||||
with:
|
with:
|
||||||
name: logs-${{ matrix.node-version }}-${{ matrix.factorio-version }}
|
name: logs-${{ matrix.node-version }}-${{ matrix.factorio-version }}
|
||||||
path: temp/test/logs
|
path: temp/test/logs
|
||||||
@@ -77,9 +77,9 @@ jobs:
|
|||||||
host: local
|
host: local
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v7
|
||||||
- uses: pnpm/action-setup@v4
|
- uses: pnpm/action-setup@v6
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v7
|
||||||
with:
|
with:
|
||||||
node-version: ${{ env.NODE_VERSION }}
|
node-version: ${{ env.NODE_VERSION }}
|
||||||
- name: Prepare and install
|
- name: Prepare and install
|
||||||
@@ -97,9 +97,9 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
timeout-minutes: 5
|
timeout-minutes: 5
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v7
|
||||||
- uses: pnpm/action-setup@v4
|
- uses: pnpm/action-setup@v6
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v7
|
||||||
with:
|
with:
|
||||||
node-version: ${{ env.NODE_VERSION }}
|
node-version: ${{ env.NODE_VERSION }}
|
||||||
- run: pnpm i --no-frozen-lockfile
|
- run: pnpm i --no-frozen-lockfile
|
||||||
@@ -109,16 +109,16 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
timeout-minutes: 5
|
timeout-minutes: 5
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v7
|
||||||
- uses: pnpm/action-setup@v4
|
- uses: pnpm/action-setup@v6
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v7
|
||||||
with:
|
with:
|
||||||
node-version: ${{ env.NODE_VERSION }}
|
node-version: ${{ env.NODE_VERSION }}
|
||||||
- run: pnpm i --no-frozen-lockfile
|
- run: pnpm i --no-frozen-lockfile
|
||||||
- run: pnpm run build-mod
|
- run: pnpm run build-mod
|
||||||
# Upload build to artifacts
|
# Upload build to artifacts
|
||||||
- name: Upload build to artifacts
|
- name: Upload build to artifacts
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v7
|
||||||
with:
|
with:
|
||||||
name: clusterio_lib
|
name: clusterio_lib
|
||||||
path: ./dist
|
path: ./dist
|
||||||
|
|||||||
@@ -15,15 +15,15 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v7
|
||||||
- uses: pnpm/action-setup@v4
|
- uses: pnpm/action-setup@v6
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v7
|
||||||
with:
|
with:
|
||||||
node-version: 24.x
|
node-version: 24.x
|
||||||
registry-url: https://registry.npmjs.org
|
registry-url: https://registry.npmjs.org
|
||||||
- run: pnpm install --no-frozen-lockfile
|
- run: pnpm install --no-frozen-lockfile
|
||||||
- run: pnpm -r --filter='./{plugins,packages}/*' publish --no-git-checks
|
- run: pnpm -r --filter='./{plugins,packages}/*' publish --no-git-checks
|
||||||
- uses: softprops/action-gh-release@v2
|
- uses: softprops/action-gh-release@v3
|
||||||
with:
|
with:
|
||||||
files: pnpm-lock.yaml
|
files: pnpm-lock.yaml
|
||||||
|
|
||||||
@@ -31,9 +31,9 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v7
|
||||||
- uses: pnpm/action-setup@v4
|
- uses: pnpm/action-setup@v6
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v7
|
||||||
with:
|
with:
|
||||||
node-version: 24.x
|
node-version: 24.x
|
||||||
- run: pnpm install --no-frozen-lockfile
|
- run: pnpm install --no-frozen-lockfile
|
||||||
@@ -41,6 +41,6 @@ jobs:
|
|||||||
- run: node ./publish.js factorio ./dist
|
- run: node ./publish.js factorio ./dist
|
||||||
env:
|
env:
|
||||||
FACTORIO_TOKEN: ${{ secrets.FACTORIO_TOKEN }}
|
FACTORIO_TOKEN: ${{ secrets.FACTORIO_TOKEN }}
|
||||||
- uses: softprops/action-gh-release@v2
|
- uses: softprops/action-gh-release@v3
|
||||||
with:
|
with:
|
||||||
files: ./dist/*
|
files: ./dist/*
|
||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
FROM node:20 as subspace_storage_builder
|
FROM node:24 AS subspace_storage_builder
|
||||||
RUN apt update && apt install -y git
|
RUN apt update && apt install -y git
|
||||||
WORKDIR /
|
WORKDIR /
|
||||||
RUN git clone https://github.com/clusterio/subspace_storage.git
|
RUN git clone https://github.com/clusterio/subspace_storage.git
|
||||||
@@ -6,7 +6,7 @@ WORKDIR /subspace_storage
|
|||||||
RUN npm install \
|
RUN npm install \
|
||||||
&& node build
|
&& node build
|
||||||
|
|
||||||
FROM node:20 as clusterio_builder
|
FROM node:24 AS clusterio_builder
|
||||||
RUN apt update \
|
RUN apt update \
|
||||||
&& apt install -y wget \
|
&& apt install -y wget \
|
||||||
&& mkdir /clusterio
|
&& mkdir /clusterio
|
||||||
|
|||||||
+2
-2
@@ -2,7 +2,7 @@
|
|||||||
"name": "root",
|
"name": "root",
|
||||||
"private": true,
|
"private": true,
|
||||||
"files": [],
|
"files": [],
|
||||||
"packageManager": "pnpm@10.28.1+sha512.7d7dbbca9e99447b7c3bf7a73286afaaf6be99251eb9498baefa7d406892f67b879adb3a1d7e687fc4ccc1a388c7175fbaae567a26ab44d1067b54fcb0d6a316",
|
"packageManager": "pnpm@12.4.1+sha512.2e81e399d73fe8390dab25e06aa788ab7a5908248d2f5a370f82b481147a6a7a367bf8048f9a6fdb6460f21a66f0542dedb8b94ca2c8723596741920b1656d4c",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "tsc --build",
|
"build": "tsc --build",
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
"no-external-test": "NO_EXTERNAL_TEST=y pnpm test",
|
"no-external-test": "NO_EXTERNAL_TEST=y pnpm test",
|
||||||
"cover": "nyc pnpm test",
|
"cover": "nyc pnpm test",
|
||||||
"fast-cover": "FAST_TEST=y nyc pnpm test",
|
"fast-cover": "FAST_TEST=y nyc pnpm test",
|
||||||
"ci-cover": "nyc --reporter=lcovonly pnpm run-script test",
|
"ci-cover": "nyc --reporter=lcovonly pnpm test",
|
||||||
"lint": "eslint packages plugins test",
|
"lint": "eslint packages plugins test",
|
||||||
"lint-fix": "eslint --fix packages plugins test",
|
"lint-fix": "eslint --fix packages plugins test",
|
||||||
"clean": "node ./clean.js",
|
"clean": "node ./clean.js",
|
||||||
|
|||||||
+4
-2
@@ -36,9 +36,11 @@ catalog:
|
|||||||
|
|
||||||
catalogMode: strict
|
catalogMode: strict
|
||||||
|
|
||||||
|
autoInstallPeers: false
|
||||||
|
|
||||||
linkWorkspacePackages: true
|
linkWorkspacePackages: true
|
||||||
|
|
||||||
onlyBuiltDependencies:
|
allowBuilds:
|
||||||
- '@swc/core'
|
'@swc/core': true
|
||||||
|
|
||||||
shellEmulator: true
|
shellEmulator: true
|
||||||
Reference in new issue
Block a user