Skip to content

Commit 3083fe6

Browse files
committed
Merge branch 'main' of github.com:FieldDB/AuthenticationWebService into upgrade/couchdb
2 parents 8f119bf + c246fc2 commit 3083fe6

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/docker-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ jobs:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v6
1717
- name: Build the Docker image
1818
run: "echo 'module.exports = { usersDbConnection: { url: \"http://localhost:5984\" }};' > config/local.js && docker build . --file Dockerfile --tag fielddb-auth:$(date +%s)"

.github/workflows/node.js.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
2121

2222
steps:
23-
- uses: actions/checkout@v2
23+
- uses: actions/checkout@v6
2424
- name: Use Node.js ${{ matrix.node-version }}
25-
uses: actions/setup-node@v2
25+
uses: actions/setup-node@v6
2626
with:
2727
node-version: ${{ matrix.node-version }}
2828
cache: 'npm'

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@
7373
},
7474
"scripts": {
7575
"docker:build": "docker build -t fielddb-auth .",
76-
"docker:test": "echo 'module.exports = { usersDbConnection: { url: \"http://localhost:5984\" }};' > config/local.js && docker-compose up -d && docker-compose logs && npm run setup && npm run test:deprecated",
77-
"docker:test:no-cache": "echo 'module.exports = { usersDbConnection: { url: \"http://localhost:5984\" }};' > config/local.js && docker-compose build --no-cache && docker-compose up -d && docker-compose logs && npm run setup && npm run test:deprecated",
76+
"docker:test": "echo 'module.exports = { usersDbConnection: { url: \"http://localhost:5984\" }};' > config/local.js && docker compose up -d && docker compose logs && npm run setup && npm run test:deprecated",
77+
"docker:test:no-cache": "echo 'module.exports = { usersDbConnection: { url: \"http://localhost:5984\" }};' > config/local.js && docker compose build --no-cache && docker compose up -d && docker compose logs && npm run setup && npm run test:deprecated",
7878
"coverage": "NODE_ENV=test BUNYAN_LOG_LEVEL=FATAL NODE_TLS_REJECT_UNAUTHORIZED=0 nyc npm test",
7979
"coveralls": "cat ./coverage/lcov.info | coveralls",
8080
"lint": "eslint ",

0 commit comments

Comments
 (0)