Skip to content

Commit a70080e

Browse files
authored
style: use common utils package (api and app) (#555)
1 parent 189d1d0 commit a70080e

File tree

88 files changed

+545
-6137
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+545
-6137
lines changed

.github/workflows/main.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,17 @@ jobs:
1313
runs-on: ubuntu-20.04
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v4
1717
- name: Setup node
18-
uses: actions/setup-node@v3
18+
uses: actions/setup-node@v4
1919
with:
2020
node-version-file: '.nvmrc'
21+
cache-dependency-path: 'yarn.lock'
22+
cache: 'yarn'
2123
- name: Install root dependencies
22-
uses: bahmutov/npm-install@v1
24+
run: yarn install
25+
- name: Build dependencies
26+
run: make ci-build
2327
- name: Install core libs
2428
run: sudo apt-get install --yes curl bc
2529
- name: Run lint + type check
@@ -29,23 +33,27 @@ jobs:
2933
runs-on: ubuntu-20.04
3034
steps:
3135
- name: Checkout
32-
uses: actions/checkout@v2
36+
uses: actions/checkout@v4
3337
- name: Setup node
34-
uses: actions/setup-node@v3
38+
uses: actions/setup-node@v4
3539
with:
3640
node-version-file: '.nvmrc'
41+
cache-dependency-path: 'yarn.lock'
42+
cache: 'yarn'
3743
- name: Install root dependencies
38-
uses: bahmutov/npm-install@v1
44+
run: yarn install
45+
- name: Build dependencies
46+
run: make ci-build
3947
- name: Run unit tests
4048
run: make ci-unit
4149
integration:
4250
timeout-minutes: 8
4351
runs-on: ubuntu-20.04
4452
steps:
4553
- name: Checkout
46-
uses: actions/checkout@v2
54+
uses: actions/checkout@v4
4755
- name: Setup node
48-
uses: actions/setup-node@v3
56+
uses: actions/setup-node@v4
4957
with:
5058
node-version-file: '.nvmrc'
5159
- name: Expose GitHub Runtime

.github/workflows/release.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout
12-
uses: actions/checkout@v2
12+
uses: actions/checkout@v4
1313
- name: Setup node
14-
uses: actions/setup-node@v3
14+
uses: actions/setup-node@v4
1515
with:
1616
node-version-file: '.nvmrc'
17+
cache-dependency-path: 'yarn.lock'
18+
cache: 'yarn'
1719
- name: Install root dependencies
18-
uses: bahmutov/npm-install@v1
20+
run: yarn install
1921
- name: Create Release Pull Request or Publish to npm
2022
id: changesets
2123
uses: changesets/action@v1

Makefile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ dev-down:
2727
dev-lint:
2828
npx nx run-many -t lint:fix
2929

30+
.PHONY: ci-build
31+
ci-build:
32+
npx nx run-many -t ci:build
33+
3034
.PHONY: ci-lint
3135
ci-lint:
3236
npx nx run-many -t ci:lint
@@ -43,12 +47,6 @@ dev-int:
4347
.PHONY: ci-int
4448
ci-int:
4549
docker compose -p int -f ./docker-compose.ci.yml run --rm api ci:int
46-
# @echo "\n\n"
47-
# @echo "Checking otel-collector...\n"
48-
# curl -v http://localhost:23133
49-
# @echo "\n\n"
50-
# @echo "Checking ingestor...\n"
51-
# curl -v http://localhost:28686/health
5250

5351
.PHONY: dev-unit
5452
dev-unit:

packages/api/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"dependencies": {
1010
"@clickhouse/client": "^0.2.10",
11-
"@clickhouse/client-common": "^1.9.1",
11+
"@hyperdx/common-utils": "^0.0.9",
1212
"@hyperdx/lucene": "^3.1.1",
1313
"@hyperdx/node-opentelemetry": "^0.8.1",
1414
"@opentelemetry/api": "^1.8.0",
@@ -34,7 +34,6 @@
3434
"mongoose": "^6.12.0",
3535
"ms": "^2.1.3",
3636
"node-schedule": "^2.1.1",
37-
"node-sql-parser": "^5.3.5",
3837
"object-hash": "^3.0.0",
3938
"on-headers": "^1.0.2",
4039
"passport": "^0.6.0",

packages/api/src/common/DisplayType.ts

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)