build: simplify command references and update build info generation

SchulteDev · SchulteDev · commit 2f12719bf588 · 2025-07-21T10:54:03.000+02:00
- Replaced direct file paths with relative command paths in scripts and config files for consistency.
- Enhanced build info generation with improved handling of commit and branch information.
- Updated `.gitignore` to include dynamic build info files.
- Enabled write access in Dockerfile bind mount to align with changes.
diff --git a/.dockerignore b/.dockerignore
@@ -1,6 +1,5 @@
 .github
 .vscode
-script
 third-party
 .dockerignore
 .gitignore
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
-.idea
-cmd/github-mcp-server/github-mcp-server
+.idea/
+cmd/github-mcp-server/build_info/*.txt
 
 # VSCode
 .vscode/*
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,7 +10,7 @@
             "request": "launch",
             "mode": "auto",
             "cwd": "${workspaceFolder}",
-            "program": "cmd/github-mcp-server/main.go",
+            "program": "./cmd/github-mcp-server",
             "args": ["stdio"],
             "console": "integratedTerminal",
         },
@@ -20,7 +20,7 @@
             "request": "launch",
             "mode": "auto",
             "cwd": "${workspaceFolder}",
-            "program": "cmd/github-mcp-server/main.go",
+            "program": "./cmd/github-mcp-server",
             "args": ["stdio", "--read-only"],
             "console": "integratedTerminal",
         }
diff --git a/Dockerfile b/Dockerfile
@@ -11,10 +11,10 @@ RUN --mount=type=cache,target=/var/cache/apk \
 # go build automatically download required module dependencies to /go/pkg/mod
 RUN --mount=type=cache,target=/go/pkg/mod \
     --mount=type=cache,target=/root/.cache/go-build \
-    --mount=type=bind,target=. \
+    --mount=type=bind,target=.,rw \
     script/prepare-build-info && \
     CGO_ENABLED=0 go build -ldflags="-s -w" \
-    -o /bin/github-mcp-server cmd/github-mcp-server/main.go
+    -o /bin/github-mcp-server ./cmd/github-mcp-server
 
 # Make a stage to run the app
 FROM gcr.io/distroless/base-debian12
diff --git a/script/get-discussions b/script/get-discussions
@@ -1,5 +1,4 @@
 #!/bin/bash
 
-# echo '{"jsonrpc":"2.0","id":3,"params":{"name":"list_discussions","arguments": {"owner": "github", "repo": "securitylab", "first": 10, "since": "2025-04-01T00:00:00Z"}},"method":"tools/call"}' | go run  cmd/github-mcp-server/main.go stdio  | jq .
-echo '{"jsonrpc":"2.0","id":3,"params":{"name":"list_discussions","arguments": {"owner": "github", "repo": "securitylab", "first": 10, "since": "2025-04-01T00:00:00Z", "sort": "CREATED_AT", "direction": "DESC"}},"method":"tools/call"}' | go run  cmd/github-mcp-server/main.go stdio  | jq .
-
+# echo '{"jsonrpc":"2.0","id":3,"params":{"name":"list_discussions","arguments": {"owner": "github", "repo": "securitylab", "first": 10, "since": "2025-04-01T00:00:00Z"}},"method":"tools/call"}' | go run  ./cmd/github-mcp-server stdio  | jq .
+echo '{"jsonrpc":"2.0","id":3,"params":{"name":"list_discussions","arguments": {"owner": "github", "repo": "securitylab", "first": 10, "since": "2025-04-01T00:00:00Z", "sort": "CREATED_AT", "direction": "DESC"}},"method":"tools/call"}' | go run  ./cmd/github-mcp-server stdio  | jq .
diff --git a/script/get-me b/script/get-me
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-echo '{"jsonrpc":"2.0","id":3,"params":{"name":"get_me"},"method":"tools/call"}' | go run  cmd/github-mcp-server/main.go stdio  | jq .
+echo '{"jsonrpc":"2.0","id":3,"params":{"name":"get_me"},"method":"tools/call"}' | go run ./cmd/github-mcp-server stdio | jq .
diff --git a/script/prepare-build-info b/script/prepare-build-info
@@ -19,8 +19,8 @@ if [ -n "${GITHUB_ACTIONS:-}" ]; then
   fi
 else
   # Local/Docker context
-  COMMIT=$(git rev-parse HEAD 2>/dev/null || echo 'unknown')
-  VERSION="dev"
+  COMMIT=$(git rev-parse HEAD 2>/dev/null || echo 'unknown commit')
+  VERSION=$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo 'unknown version')
 fi
 
 # Write build info files

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/bin/bash`
`2`	`2`
`3`		`-echo '{"jsonrpc":"2.0","id":3,"params":{"name":"get_me"},"method":"tools/call"}' \| go run cmd/github-mcp-server/main.go stdio \| jq .`
	`3`	`+echo '{"jsonrpc":"2.0","id":3,"params":{"name":"get_me"},"method":"tools/call"}' \| go run ./cmd/github-mcp-server stdio \| jq .`