Skip to content

Commit 7f342c4

Browse files
committed
chorre: adjust versions to test
1 parent ff015cc commit 7f342c4

File tree

3 files changed

+11
-20
lines changed

3 files changed

+11
-20
lines changed
Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
knex:
2-
- versions:
3-
include: '>=2 <4'
4-
mode: max-5
5-
commands: npm run test
6-
- versions:
7-
include: '>=0.10.0 <2'
8-
mode: max-5
9-
peerDependencies: "@vscode/sqlite3@^5.0.7"
10-
commands: npm run test
2+
jobs:
3+
- versions:
4+
include: ">=1.0.0 <2"
5+
mode: max-3
6+
peerDependencies: "@vscode/sqlite3@^5.0.7"
7+
commands: npm run test
8+
- versions:
9+
include: ">=2.0.0 <4"
10+
exclude: '3.0.0' # broken release
11+
mode: max-3
12+
commands: npm run test

packages/instrumentation-knex/package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"prepublishOnly": "npm run compile",
1818
"tdd": "npm run test -- --watch-extensions ts --watch",
1919
"test": "nyc mocha 'test/**/*.ts'",
20-
"//todo": "echo \"add test-all-versions\"",
2120
"test-all-versions": "tav",
2221
"version:update": "node ../../scripts/version-update.js",
2322
"watch": "tsc -w"
@@ -48,7 +47,6 @@
4847
"devDependencies": {
4948
"@opentelemetry/api": "^1.3.0",
5049
"@opentelemetry/context-async-hooks": "^2.0.0",
51-
"@opentelemetry/contrib-test-utils": "^0.55.0",
5250
"@opentelemetry/sdk-trace-base": "^2.0.0",
5351
"@opentelemetry/sdk-trace-node": "^2.0.0",
5452
"better-sqlite3": "^11.10.0",

packages/instrumentation-knex/test/index.test.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,8 @@ import {
2727
SimpleSpanProcessor,
2828
} from '@opentelemetry/sdk-trace-base';
2929
import * as assert from 'assert';
30-
import * as semver from 'semver';
31-
import { getPackageVersion } from '@opentelemetry/contrib-test-utils';
3230
import { KnexInstrumentation } from '../src';
3331

34-
const knexVersion = getPackageVersion('knex');
35-
3632
const plugin = new KnexInstrumentation({
3733
maxQueryLength: 50,
3834
});
@@ -202,11 +198,6 @@ describe('Knex instrumentation', () => {
202198
});
203199

204200
it('should catch better-sqlite3 errors', async function () {
205-
// This dialect was added in v1.0.0
206-
// ref: https://github.com/knex/knex/releases/tag/1.0.0
207-
if (semver.lt(knexVersion, '1.0.0')) {
208-
this.skip();
209-
}
210201
client = knex({
211202
client: 'better-sqlite3',
212203
connection: {

0 commit comments

Comments
 (0)