Skip to content

Commit a2fbe34

Browse files
kylelai1kylelai1
committed
Merge branch 'main' into atlas-list-performance-advisor-base-tool
2 parents 016af0e + dd36b1a commit a2fbe34

Some content is hidden

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

65 files changed

+2609
-653
lines changed

‎.github/workflows/accuracy-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
steps:
3030
- uses: GitHubSecurityLab/actions-permissions/monitor@v1
3131
- uses: actions/checkout@v5
32-
- uses: actions/setup-node@v4
32+
- uses: actions/setup-node@v5
3333
with:
3434
node-version-file: package.json
3535
cache: "npm"

‎.github/workflows/check.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
- uses: GitHubSecurityLab/actions-permissions/monitor@v1
1919
- uses: actions/checkout@v5
20-
- uses: actions/setup-node@v4
20+
- uses: actions/setup-node@v5
2121
with:
2222
node-version-file: package.json
2323
cache: "npm"
@@ -31,7 +31,7 @@ jobs:
3131
steps:
3232
- uses: GitHubSecurityLab/actions-permissions/monitor@v1
3333
- uses: actions/checkout@v5
34-
- uses: actions/setup-node@v4
34+
- uses: actions/setup-node@v5
3535
with:
3636
node-version-file: package.json
3737
cache: "npm"
@@ -45,7 +45,7 @@ jobs:
4545
steps:
4646
- uses: GitHubSecurityLab/actions-permissions/monitor@v1
4747
- uses: actions/checkout@v5
48-
- uses: actions/setup-node@v4
48+
- uses: actions/setup-node@v5
4949
with:
5050
node-version-file: package.json
5151
cache: "npm"

‎.github/workflows/code_health.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: GitHubSecurityLab/actions-permissions/monitor@v1
2222
if: matrix.os == 'ubuntu-latest'
2323
- uses: actions/checkout@v5
24-
- uses: actions/setup-node@v4
24+
- uses: actions/setup-node@v5
2525
with:
2626
node-version-file: package.json
2727
cache: "npm"
@@ -43,7 +43,7 @@ jobs:
4343
steps:
4444
- uses: GitHubSecurityLab/actions-permissions/monitor@v1
4545
- uses: actions/checkout@v5
46-
- uses: actions/setup-node@v4
46+
- uses: actions/setup-node@v5
4747
with:
4848
node-version-file: package.json
4949
cache: "npm"
@@ -69,7 +69,7 @@ jobs:
6969
needs: [run-tests, run-atlas-tests]
7070
steps:
7171
- uses: actions/checkout@v5
72-
- uses: actions/setup-node@v4
72+
- uses: actions/setup-node@v5
7373
with:
7474
node-version-file: package.json
7575
cache: "npm"

‎.github/workflows/code_health_fork.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: GitHubSecurityLab/actions-permissions/monitor@v1
2121
if: matrix.os == 'ubuntu-latest'
2222
- uses: actions/checkout@v5
23-
- uses: actions/setup-node@v4
23+
- uses: actions/setup-node@v5
2424
with:
2525
node-version-file: package.json
2626
cache: "npm"

‎.github/workflows/jira-issue.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
6363
- name: Remove create-jira label
6464
if: github.event.action == 'labeled' && github.event.label.name == 'create-jira'
65-
uses: actions/github-script@v7
65+
uses: actions/github-script@v8
6666
with:
6767
script: |
6868
try {

‎.github/workflows/prepare_release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
app-id: ${{ vars.DEVTOOLS_BOT_APP_ID }}
2424
private-key: ${{ secrets.DEVTOOLS_BOT_PRIVATE_KEY }}
2525
- uses: actions/checkout@v5
26-
- uses: actions/setup-node@v4
26+
- uses: actions/setup-node@v5
2727
with:
2828
node-version-file: package.json
2929
registry-url: "https://registry.npmjs.org"

‎.github/workflows/publish.yaml‎

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ jobs:
1212
outputs:
1313
VERSION_EXISTS: ${{ steps.check-version.outputs.VERSION_EXISTS }}
1414
VERSION: ${{ steps.get-version.outputs.VERSION }}
15+
RELEASE_CHANNEL: ${{ steps.npm-tag.outputs.RELEASE_CHANNEL }}
1516
steps:
1617
- uses: GitHubSecurityLab/actions-permissions/monitor@v1
1718
- uses: actions/checkout@v5
1819
with:
1920
fetch-depth: 0
20-
- uses: actions/setup-node@v4
21+
- uses: actions/setup-node@v5
2122
with:
2223
node-version-file: package.json
2324
registry-url: "https://registry.npmjs.org"
@@ -42,6 +43,33 @@ jobs:
4243
else
4344
echo "VERSION_EXISTS=false" >> "$GITHUB_OUTPUT"
4445
fi
46+
- name: Get npm tag
47+
id: npm-tag
48+
shell: bash
49+
run: |
50+
set -e
51+
VERSION="${{ steps.get-version.outputs.VERSION }}"
52+
53+
# Extract the release channel (latest, alpha, beta, rc)
54+
if [[ $VERSION =~ ^v?[0-9]+\.[0-9]+\.[0-9]+(-(.+))?$ ]]; then
55+
if [[ -n "${BASH_REMATCH[2]}" ]]; then
56+
CAPTURED_CHANNEL="${BASH_REMATCH[2]}"
57+
# The captured channel might have more dots, cases like
58+
# v1.2.3-alpha.1 For such cases we only want the channel relevant
59+
# part which is alpha.
60+
RELEASE_CHANNEL="${CAPTURED_CHANNEL%%.*}"
61+
else
62+
RELEASE_CHANNEL="latest"
63+
fi
64+
else
65+
echo "::error title=Invalid Version::Encountered unexpected version ${{ steps.get-version.outputs.VERSION }}, cannot proceed!"
66+
exit 1
67+
fi
68+
69+
echo "RELEASE_CHANNEL=${RELEASE_CHANNEL}" >> "$GITHUB_OUTPUT"
70+
- name: Output deployment info
71+
run: echo "::notice title=Deployment Info::Deploying version ${{ steps.get-version.outputs.VERSION }} to channel ${{ steps.npm-tag.outputs.RELEASE_CHANNEL }}"
72+
4573
publish:
4674
runs-on: ubuntu-latest
4775
environment: Production
@@ -53,21 +81,22 @@ jobs:
5381
steps:
5482
- uses: GitHubSecurityLab/actions-permissions/monitor@v1
5583
- uses: actions/checkout@v5
56-
- uses: actions/setup-node@v4
84+
- uses: actions/setup-node@v5
5785
with:
5886
node-version-file: package.json
5987
registry-url: "https://registry.npmjs.org"
6088
cache: "npm"
89+
6190
- name: Build package
6291
run: |
6392
npm ci
6493
npm run build
6594
- name: Publish to NPM
66-
run: npm publish
95+
run: npm publish --tag ${{ needs.check.outputs.RELEASE_CHANNEL }}
6796
env:
6897
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
6998
- name: Publish git release
7099
env:
71100
GH_TOKEN: ${{ github.token }}
72101
run: |
73-
gh release create ${{ needs.check.outputs.VERSION }} --title "${{ needs.check.outputs.VERSION }}" --generate-notes --target ${{ github.sha }}
102+
gh release create ${{ needs.check.outputs.VERSION }} --title "${{ needs.check.outputs.VERSION }}" --generate-notes --target ${{ github.sha }} ${{ (needs.check.outputs.RELEASE_CHANNEL != 'latest' && '--prerelease') || ''}}

‎.github/workflows/stale.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
pull-requests: write
1616
steps:
1717
- uses: GitHubSecurityLab/actions-permissions/monitor@v1
18-
- uses: actions/stale@v9
18+
- uses: actions/stale@v10
1919
id: stale
2020
with:
2121
repo-token: ${{ secrets.GITHUB_TOKEN }}

‎.smithery/Dockerfile‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
# ----- Build Stage -----
33
FROM node:lts-alpine AS builder
44

5-
RUN adduser -D mcpuser
6-
USER mcpuser
5+
RUN addgroup -S mcp && adduser -S mcp -G mcp -s /sbin/nologin
6+
RUN chown -R mcp:mcp /home/mcp
7+
USER mcp
78

8-
WORKDIR /app
9+
WORKDIR /home/mcp
910

1011
# Copy package and configuration
1112
COPY ../package.json ../package-lock.json ../tsconfig.json ../tsconfig.build.json ./
@@ -18,9 +19,12 @@ RUN npm ci && npm run build
1819

1920
# ----- Production Stage -----
2021
FROM node:lts-alpine
22+
RUN addgroup -S mcp && adduser -S mcp -G mcp -s /sbin/nologin
23+
RUN chown -R mcp:mcp /dist
24+
USER mcp
2125

2226
# Copy built artifacts
23-
COPY --from=builder /app/dist ./dist
27+
COPY --from=builder /home/mcp/dist ./dist
2428

2529
# Copy package.json for production install
2630
COPY ../package.json ../package-lock.json ./

0 commit comments

Comments
 (0)