Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
- uses: actions/checkout@v7
- uses: actions/cache@v6
with:
path: '**/node_modules'
key: ${{ runner.os }}-lint-modules-${{ hashFiles('**/yarn.lock') }}
- uses: actions/setup-node@v2
- uses: actions/setup-node@v7
with:
node-version: 14.x
node-version: 22.x
- run: yarn install
- run: yarn run lint

Expand All @@ -22,19 +22,19 @@ jobs:
matrix:
os: [ubuntu-latest]
node-version:
- 12.x
- 14.x
- 16.x
- 20.x
- 22.x
- 24.x
steps:
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v7
with:
node-version: ${{ matrix.node-version }}
- name: Ensure line endings are consistent
run: git config --global core.autocrlf input
- name: Check out repository
uses: actions/checkout@v2
- uses: actions/cache@v2
uses: actions/checkout@v7
- uses: actions/cache@v6
with:
path: '**/node_modules'
key: ${{ runner.os }}-test-modules-${{ hashFiles('**/yarn.lock') }}
Expand All @@ -43,7 +43,7 @@ jobs:
- name: Run tests
run: yarn run test-ci
- name: Submit coverage results
uses: coverallsapp/github-action@master
uses: coverallsapp/github-action@v2
with:
github-token: ${{ secrets.github_token }}
flag-name: run-${{ matrix.node-version }}
Expand All @@ -54,7 +54,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Consolidate test coverage from different jobs
uses: coverallsapp/github-action@master
uses: coverallsapp/github-action@v2
with:
github-token: ${{ secrets.github_token }}
parallel-finished: true
Expand All @@ -66,13 +66,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Use Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v7
with:
node-version: '14.x'
node-version: '22.x'
- name: Check out repository
uses: actions/checkout@v2
uses: actions/checkout@v7
- name: Load cache
uses: actions/cache@v2
uses: actions/cache@v6
with:
path: '**/node_modules'
key: ${{ runner.os }}-docker-modules-v1-${{ hashFiles('**/yarn.lock') }}
Expand Down
1 change: 0 additions & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"packages": [
"packages/*"
],
"useWorkspaces": true,
"version": "3.3.0",
"loglevel": "success",
"registry": "https://registry.npmjs.org/",
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
"coveralls": "^3.0.9",
"eslint": "^7.0.0",
"eslint-plugin-import": "^2.22.0",
"lerna": "^4.0.0",
"lerna": "9.0.7",
"manual-git-changelog": "^1.0.1",
"mocha": "^8.0.0",
"nyc": "^15.0.0",
"pre-commit": "^1.1.3",
"sinon": "^1.17.4",
"sinon-chai": "^3.0.0",
"sinon-chai": "^2.14.0",
"supertest": "^6.0.0"
},
"pre-commit": [
Expand All @@ -33,6 +33,7 @@
"test-ci": "nyc --reporter=lcov npm run mocha",
"lint": "eslint packages/*/bin/* packages/*/lib packages/*/test",
"clean": "rm -rf ./node_modules && rm -rf ./packages/*/node_modules",
"dedupe": "npx yarn-deduplicate yarn.lock --scopes",
"publish": "lerna publish",
"publish-bare": "lerna exec -- npm publish --silent",
"postinstall": "lerna run prepare",
Expand Down
2 changes: 1 addition & 1 deletion packages/datasource-hdt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
"@ldf/core": "^3.2.1"
},
"optionalDependencies": {
"hdt": "^3.0.1"
"hdt": "^3.3.2"
}
}
12 changes: 6 additions & 6 deletions packages/server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM node:16-slim
FROM node:22-slim
LABEL description="Triple Pattern Fragment Server."
# Install location
ENV dir /var/www/@ldf/server
ENV dir=/var/www/@ldf/server

# Copy the server files
COPY components ${dir}/components/
Expand All @@ -15,12 +15,12 @@ RUN npm config set @ldf:registry $NPM_REGISTRY

# Install the node module
RUN apt-get update && \
apt-get install -y g++ make python && \
cd ${dir}
apt-get install -y g++ make python3 && \
cd ${dir}

WORKDIR ${dir}
RUN npm install --only=production
RUN apt-get remove -y g++ make python && apt-get autoremove -y && \
RUN npm install --only=production
RUN apt-get remove -y g++ make python3 && apt-get autoremove -y && \
rm -rf /var/cache/apt/archives

# Expose the default port
Expand Down
Loading