Skip to content

Commit f12f5ac

Browse files
committed
modernize
1 parent 343f273 commit f12f5ac

File tree

17 files changed

+13803
-8597
lines changed

17 files changed

+13803
-8597
lines changed

.github/workflows/luarocks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- uses: actions/checkout@v2
20-
- uses: leafo/gh-actions-lua@v8.0.0
20+
- uses: leafo/gh-actions-lua@v11
2121
with:
2222
luaVersion: ${{ matrix.luaVersion }}
23-
- uses: leafo/gh-actions-luarocks@v4.0.0
23+
- uses: leafo/gh-actions-luarocks@v5
2424
- run: luarocks make

.github/workflows/release.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ jobs:
88
name: build for node.js
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: mymindstorm/setup-emsdk@v7
12-
- uses: actions/checkout@v2
11+
- uses: mymindstorm/setup-emsdk@v13
12+
- uses: actions/checkout@v4
1313
- run: cmake -E make_directory build
1414
- run: emcmake cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release
1515
working-directory: build
1616
- run: cmake --build . && cmake --build . --target install
1717
working-directory: build
1818
- name: Archive build result for js
19-
uses: actions/upload-artifact@v2
19+
uses: actions/upload-artifact@v4
2020
with:
2121
name: node_lua_with_lrdb
2222
path: node/bin/node_lua_with_lrdb.*
@@ -26,26 +26,26 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@v2
29+
uses: actions/checkout@v4
3030
with:
3131
fetch-depth: 0
3232
persist-credentials: false
3333
- name: Setup Node.js
34-
uses: actions/setup-node@v1
34+
uses: actions/setup-node@v4
3535
with:
36-
node-version: 12
36+
node-version: 20
3737
- name: Download a node_lua_with_lrdb
38-
uses: actions/download-artifact@v2
38+
uses: actions/download-artifact@v4
3939
with:
4040
name: node_lua_with_lrdb
4141
path: node/bin/
42-
- run: yarn
42+
- run: npm ci
4343
working-directory: node
44-
- run: yarn bundle
44+
- run: npm run bundle
4545
working-directory: node
4646
- name: Release
4747
env:
4848
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
4949
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
50-
run: yarn semantic-release
50+
run: npx semantic-release
5151
working-directory: node

.github/workflows/test.yml

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
os: macos-latest,
4040
}
4141
steps:
42-
- uses: actions/checkout@v2
42+
- uses: actions/checkout@v4
4343

4444
- name: Create Build Environment
4545
# Some projects don't allow in-source building, so create a separate build directory
@@ -73,7 +73,7 @@ jobs:
7373
name: coverage
7474
runs-on: ubuntu-latest
7575
steps:
76-
- uses: actions/checkout@v2
76+
- uses: actions/checkout@v4
7777
- name: Install lcov
7878
run: git clone https://github.com/linux-test-project/lcov.git && cd lcov && sudo make install
7979

@@ -95,29 +95,19 @@ jobs:
9595
shell: bash
9696
run: ctest -C $BUILD_TYPE
9797

98-
- name: Coverage
99-
working-directory: coverage
100-
shell: bash
101-
run: lcov -c -d . --include **/include/lrdb/** -o ./lcov.info
102-
103-
- name: Coveralls
104-
uses: coverallsapp/github-action@master
105-
with:
106-
github-token: ${{ secrets.GITHUB_TOKEN }}
107-
10898
emscripten:
10999
name: build for node.js
110100
runs-on: ubuntu-latest
111101
steps:
112-
- uses: mymindstorm/setup-emsdk@v7
113-
- uses: actions/checkout@v2
102+
- uses: mymindstorm/setup-emsdk@v11
103+
- uses: actions/checkout@v4
114104
- run: cmake -E make_directory build
115105
- run: emcmake cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release
116106
working-directory: build
117107
- run: cmake --build . && cmake --build . --target install
118108
working-directory: build
119109
- name: Archive build result for js
120-
uses: actions/upload-artifact@v2
110+
uses: actions/upload-artifact@v4
121111
with:
122112
name: node_lua_with_lrdb
123113
path: node/bin/node_lua_with_lrdb.*
@@ -128,25 +118,25 @@ jobs:
128118
runs-on: ubuntu-latest
129119
strategy:
130120
matrix:
131-
node-version: [10.x, 12.x, 14.x]
121+
node-version: [20.x, 22.x]
132122
steps:
133-
- uses: actions/checkout@v2
123+
- uses: actions/checkout@v4
134124
- name: Use Node.js ${{ matrix.node-version }}
135-
uses: actions/setup-node@v1
125+
uses: actions/setup-node@v4
136126
with:
137127
node-version: ${{ matrix.node-version }}
138128
- name: Download a node_lua_with_lrdb
139-
uses: actions/download-artifact@v2
129+
uses: actions/download-artifact@v4
140130
with:
141131
name: node_lua_with_lrdb
142132
path: node/bin/
143-
- run: yarn
133+
- run: npm ci
144134
working-directory: node
145-
- run: yarn build
135+
- run: npm run build
146136
working-directory: node
147-
- run: yarn lint
137+
- run: npm run lint
148138
working-directory: node
149-
- run: yarn test
139+
- run: npm run test
150140
working-directory: node
151141
env:
152142
CI: true

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
set(CMAKE_LEGACY_CYGWIN_WIN32 0)
2-
cmake_minimum_required(VERSION 2.6)
2+
cmake_minimum_required(VERSION 3.16)
33
project(LRDB)
44

55
include(cmake/ReduceDependencies.cmake)
@@ -48,7 +48,7 @@ if(NOT MSVC)#-Wall nonsense on MSVC
4848
add_definitions(-Wno-variadic-macros)
4949
add_definitions ("-Wno-unused-local-typedefs")
5050
add_definitions ("-Wno-unknown-warning-option")
51-
add_definitions("-std=c++11")
51+
add_definitions("-std=c++17")
5252
endif(NOT MSVC)
5353

5454

node/.eslintrc.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ module.exports = {
55
extends: [
66
'eslint:recommended',
77
'plugin:@typescript-eslint/recommended',
8-
'prettier',
9-
'prettier/@typescript-eslint',
108
'plugin:jest/recommended',
119
],
1210
}

0 commit comments

Comments
 (0)