Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Single appmap yml #1781

Merged
merged 5 commits into from
May 10, 2024
Merged
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
23 changes: 1 addition & 22 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -133,14 +133,7 @@ jobs:
run: |
cd packages/cli
yarn run lint
npx appmap-node yarn run test

- name: Save AppMaps
uses: actions/cache/save@v3
if: always()
with:
path: ./packages/cli/tmp/appmap
key: appmaps-${{ github.sha }}-${{ github.run_attempt }}
yarn run test

test_scanner:
runs-on: ubuntu-latest
@@ -163,8 +156,6 @@ jobs:
cd packages/scanner
yarn run lint
yarn run test
# TODO: Run only the appmap-node version of these tests
# npx appmap-node yarn run test

test_native:
runs-on: ubuntu-latest
@@ -212,18 +203,6 @@ jobs:
yarn workspaces foreach -v -t --exclude root --exclude @appland/appmap --exclude @appland/components --exclude @appland/scanner run lint
yarn workspaces foreach -v -t --exclude root --exclude @appland/appmap --exclude @appland/components --exclude @appland/scanner run test

appmap-analysis:
if: always()
needs: [test_cli]
uses: getappmap/analyze-action/.github/workflows/appmap-analysis.yml@v1
with:
directory: ./packages/cli
permissions:
actions: read
contents: read
checks: write
pull-requests: write

release:
if: github.ref == 'refs/heads/main'
needs:
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -38,5 +38,6 @@ pnpm-debug.log*
release

# AppMap
tmp/appmap
packages/*/tmp/
*.appmap.json
25 changes: 25 additions & 0 deletions appmap.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: appmap-js
appmap_dir: tmp/appmap
packages:
- path: packages/cli
exclude:
- node_modules
- .yarn
- splitCamelized
- isCamelized
- path: packages/navie
exclude:
- node_modules
- .yarn
- path: packages/client
exclude:
- node_modules
- .yarn
- path: packages/openapi
exclude:
- node_modules
- .yarn
- path: packages/scanner
exclude:
- node_modules
- .yarn
1 change: 0 additions & 1 deletion docs/navie/using-navie.md
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@ name: Using Navie
step: 3
toc: true
navie: true
toc: true
redirect_from: [/docs/navie/how-to-use-navie]
---

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@
"@tsconfig/recommended": "^1.0.3",
"@types/jest": "^29.5.2",
"@types/node": "^17.0.2",
"appmap-node": "^2.20.0",
"eslint": "^7.25.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^3.4.0",
13 changes: 0 additions & 13 deletions packages/cli/appmap.yml

This file was deleted.

1 change: 0 additions & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -54,7 +54,6 @@
"@types/validator": "^13.7.10",
"@types/w3c-xmlserializer": "^2.0.2",
"@types/yargs": "^17.0.2",
"appmap-node": "^2.20.0",
"esbuild": "0.19.8",
"eslint": "^8.56.0",
"eslint-config-prettier": "^8.3.0",
3 changes: 1 addition & 2 deletions packages/client/package.json
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
"build": "tsc",
"watch": "tsc --watch",
"lint": "eslint",
"test": "appmap-node jest"
"test": "jest"
},
"publishConfig": {
"access": "public"
@@ -32,7 +32,6 @@
"@types/node": "^17.0.2",
"@typescript-eslint/eslint-plugin": "^5.51.0",
"@typescript-eslint/parser": "^5.7.0",
"appmap-node": "^2.19.3",
"eslint": "^8.4.1",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-airbnb-typescript": "^17.0.0",
3 changes: 1 addition & 2 deletions packages/models/package.json
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
"lint": "eslint 'src/**/*.[jt]s' 'tests/**/*.[jt]s'",
"lint:fix": "eslint 'src/**/*.[jt]s' 'tests/**/*.[jt]s' --fix",
"pre-commit": "lint-staged",
"test": "appmap-node jest",
"test": "jest",
"watch": "tsup --watch"
},
"lint-staged": {
@@ -32,7 +32,6 @@
"@types/crypto-js": "^4.1.1",
"@typescript-eslint/eslint-plugin": "^5.43.0",
"@typescript-eslint/parser": "^5.43.0",
"appmap-node": "^2.19.3",
"eslint": "^7.25.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.22.1",
3 changes: 0 additions & 3 deletions packages/navie/appmap.yml

This file was deleted.

3 changes: 1 addition & 2 deletions packages/navie/package.json
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
"scripts": {
"build": "tsc",
"watch": "tsc --watch",
"test": "appmap-node jest",
"test": "npx appmap-node jest",
"lint": "eslint"
},
"publishConfig": {
@@ -23,7 +23,6 @@
"@types/node": "^17.0.2",
"@typescript-eslint/eslint-plugin": "^5.51.0",
"@typescript-eslint/parser": "^5.7.0",
"appmap-node": "^2.19.1",
"eslint": "^8.4.1",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-airbnb-typescript": "^17.0.0",
3 changes: 1 addition & 2 deletions packages/openapi/package.json
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
"main": "dist/index.js",
"types": "dist/index.d.ts",
"scripts": {
"test": "appmap-node jest",
"test": "jest",
"build": "tsc -p tsconfig.build.json",
"watch": "tsc -p tsconfig.build.json --watch",
"lint": "eslint src"
@@ -19,7 +19,6 @@
"@types/js-yaml": "^4.0.5",
"@typescript-eslint/eslint-plugin": "^5.7.0",
"@typescript-eslint/parser": "^5.7.0",
"appmap-node": "^2.19.3",
"eslint": "^8.4.1",
"jest": "^29.5.0",
"openapi-types": "^12.1.0",
15 changes: 0 additions & 15 deletions packages/scanner/appmap.yml

This file was deleted.

2 changes: 1 addition & 1 deletion packages/scanner/package.json
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
"doc-up-to-date": "git diff --exit-code doc/",
"lint": "eslint src --ext .ts",
"ci": "yarn lint && yarn build && yarn schema-up-to-date && yarn doc-up-to-date && yarn test",
"test": "jest --filter=./test/testFilter.js --detectOpenHandles",
"test": "yarn jest",
"jest": "jest --filter=./test/testFilter.js --detectOpenHandles",
"semantic-release": "semantic-release",
"watch": "node bin/preBuild.js && tsc -p tsconfig.build.json --watch"
49 changes: 0 additions & 49 deletions packages/sequence-diagram/appmap.yml

This file was deleted.

3 changes: 1 addition & 2 deletions packages/telemetry/package.json
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
"version": "1.0.0",
"license": "MIT",
"scripts": {
"test": "appmap-node jest",
"test": "jest",
"lint": "eslint telemetry.ts",
"pre-commit": "lint-staged"
},
@@ -20,7 +20,6 @@
"@types/jest": "^29.4.1",
"@typescript-eslint/eslint-plugin": "^5.7.0",
"@typescript-eslint/parser": "^5.7.0",
"appmap-node": "^2.19.3",
"eslint": "^8.4.1",
"eslint-config-prettier": "^8.3.0",
"jest": "^29.5.0",
26 changes: 2 additions & 24 deletions yarn.lock
Original file line number Diff line number Diff line change
@@ -180,7 +180,6 @@ __metadata:
JSONStream: ^1.3.5
ajv: ^8.6.3
applicationinsights: ^2.1.4
appmap-node: ^2.20.0
async: ^3.2.4
axios: ^0.27.2
better-sqlite3: ^9.5.0
@@ -269,7 +268,6 @@ __metadata:
"@types/node": ^17.0.2
"@typescript-eslint/eslint-plugin": ^5.51.0
"@typescript-eslint/parser": ^5.7.0
appmap-node: ^2.19.3
eslint: ^8.4.1
eslint-config-airbnb-base: ^15.0.0
eslint-config-airbnb-typescript: ^17.0.0
@@ -431,7 +429,6 @@ __metadata:
"@types/crypto-js": ^4.1.1
"@typescript-eslint/eslint-plugin": ^5.43.0
"@typescript-eslint/parser": ^5.43.0
appmap-node: ^2.19.3
crypto-js: ^4.0.0
eslint: ^7.25.0
eslint-config-prettier: ^8.3.0
@@ -457,7 +454,6 @@ __metadata:
"@types/node": ^17.0.2
"@typescript-eslint/eslint-plugin": ^5.51.0
"@typescript-eslint/parser": ^5.7.0
appmap-node: ^2.19.1
eslint: ^8.4.1
eslint-config-airbnb-base: ^15.0.0
eslint-config-airbnb-typescript: ^17.0.0
@@ -488,7 +484,6 @@ __metadata:
"@types/js-yaml": ^4.0.5
"@typescript-eslint/eslint-plugin": ^5.7.0
"@typescript-eslint/parser": ^5.7.0
appmap-node: ^2.19.3
eslint: ^8.4.1
jest: ^29.5.0
js-yaml: ^4.1.0
@@ -621,7 +616,6 @@ __metadata:
"@typescript-eslint/eslint-plugin": ^5.7.0
"@typescript-eslint/parser": ^5.7.0
applicationinsights: ^2.1.4
appmap-node: ^2.19.3
conf: <11
eslint: ^8.4.1
eslint-config-prettier: ^8.3.0
@@ -14394,24 +14388,7 @@ __metadata:
languageName: node
linkType: hard

"appmap-node@npm:^2.19.1":
version: 2.19.1
resolution: "appmap-node@npm:2.19.1"
dependencies:
acorn-walk: ^8.2.0
astring: ^1.8.6
chalk: <5
json5: ^2.2.3
meriyah: ^4.3.7
source-map-js: ^1.0.2
yaml: ^2.3.4
bin:
appmap-node: bin/appmap-node.js
checksum: 897f5ea6fb840731588003c85e2c91092ffb6c6068e6b19d2e7f2ebd5a5f1ebecf0d9cc7cb1bb13320d68db9726e5b8a8cda0c4a7ebd1c5813adaf42090b62b2
languageName: node
linkType: hard

"appmap-node@npm:^2.19.3, appmap-node@npm:^2.20.0":
"appmap-node@npm:^2.20.0":
version: 2.20.0
resolution: "appmap-node@npm:2.20.0"
dependencies:
@@ -36234,6 +36211,7 @@ resolve@1.1.7:
"@tsconfig/recommended": ^1.0.3
"@types/jest": ^29.5.2
"@types/node": ^17.0.2
appmap-node: ^2.20.0
eslint: ^7.25.0
eslint-config-prettier: ^8.3.0
eslint-plugin-prettier: ^3.4.0
Loading