Skip to content

Commit 7c6873c

Browse files
authored
Merge pull request #267 from buildkite/chore_upgrade_deps
chore(deps): upgrade all deps and refactor pipeline to use mise
2 parents b248497 + a77f2a2 commit 7c6873c

11 files changed

Lines changed: 371 additions & 361 deletions

File tree

.buildkite/Dockerfile.build

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

.buildkite/docker-compose.yaml

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

.buildkite/pipeline.release.yml

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,26 @@
1+
image: "buildkite/hosted-agent-base-images:ubuntu-jammy"
2+
13
agents:
24
queue: hosted
35

46
steps:
57
- label: ":terminal: build ({{matrix}})"
8+
command: ".buildkite/release.sh release --clean --split"
69
matrix:
710
- "darwin"
811
- "linux"
912
- "windows"
13+
env:
14+
- GOOS={{matrix}}
1015
artifact_paths:
1116
- dist/**/*
1217
plugins:
13-
- docker-compose#v5.10.0:
14-
command:
15-
- .buildkite/release.sh
16-
- release
17-
- --clean
18-
- --split
19-
config: .buildkite/docker-compose.yaml
20-
env:
21-
- GOOS={{matrix}}
22-
mount-buildkite-agent: true
23-
run: goreleaser
24-
shell: false
25-
tty: true
26-
progress: plain
18+
- mise#v1.1.1: ~
2719

2820
- wait: ~
2921

3022
- label: ":rocket: :github: MCP Release"
23+
command: ".buildkite/release.sh continue --merge"
3124
artifact_paths:
3225
- dist/**/*
3326
env:
@@ -48,19 +41,4 @@ steps:
4841
- artifacts#v1.9.3:
4942
download:
5043
- dist/**/*
51-
- docker-compose#v5.10.0:
52-
command:
53-
- .buildkite/release.sh
54-
- continue
55-
- --merge
56-
config: .buildkite/docker-compose.yaml
57-
env:
58-
- GITHUB_USER
59-
- GITHUB_TOKEN
60-
- DOCKERHUB_USER
61-
- DOCKERHUB_PASSWORD
62-
mount-buildkite-agent: true
63-
run: goreleaser
64-
shell: false
65-
tty: true
66-
progress: plain
44+
- mise#v1.1.1: ~

.buildkite/pipeline.yml

Lines changed: 17 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
image: "buildkite/hosted-agent-base-images:ubuntu-jammy"
2+
13
agents:
24
queue: hosted
35

@@ -14,12 +16,11 @@ steps:
1416
steps:
1517
- name: ":golangci-lint: lint"
1618
command: golangci-lint run --verbose --timeout 3m
19+
env:
20+
- GOCACHE=~/gocache
21+
- GOMODCACHE=~/gomodcache
1722
plugins:
18-
- docker-compose#v5.10.0:
19-
config: .buildkite/docker-compose.yaml
20-
run: goreleaser
21-
tty: true
22-
progress: plain
23+
- mise#v1.1.1: ~
2324

2425
- name: ":go: test"
2526
artifact_paths:
@@ -28,41 +29,28 @@ steps:
2829
- go test -coverprofile cover.out ./...
2930
- go run github.com/nikolaydubina/go-cover-treemap@latest -coverprofile cover.out > cover-tree.svg
3031
- echo '<details><summary>Coverage tree map</summary><img src="artifact://cover-tree.svg" alt="Test coverage tree map" width="70%"></details>' | buildkite-agent annotate --style "info"
32+
env:
33+
- GOCACHE=~/gocache
34+
- GOMODCACHE=~/gomodcache
3135
plugins:
32-
- docker-compose#v5.10.0:
33-
config: .buildkite/docker-compose.yaml
34-
run: goreleaser
35-
tty: true
36-
mount-buildkite-agent: true
37-
progress: plain
36+
- mise#v1.1.1: ~
3837

3938
- label: ":terminal: build ({{matrix}})"
39+
command: ".buildkite/release.sh release --clean --snapshot --split"
4040
depends_on: quality-checks
41+
env:
42+
- GOCACHE=~/gocache
43+
- GOMODCACHE=~/gomodcache
44+
- GOOS={{matrix}}
4145
matrix:
4246
- "darwin"
4347
- "linux"
4448
- "windows"
4549
artifact_paths:
4650
- dist/**/*
4751
plugins:
48-
- docker-compose#v5.10.0:
49-
command:
50-
- .buildkite/release.sh
51-
- release
52-
- --clean
53-
- --snapshot
54-
- --split
55-
config: .buildkite/docker-compose.yaml
56-
entrypoint: /bin/bash
57-
env:
58-
- GOOS={{matrix}}
59-
mount-buildkite-agent: true
60-
run: goreleaser
61-
shell: false
62-
tty: true
63-
progress: plain
64-
65-
# validate the docker file builds correctly as this is used by docker hub for publishing the mcp into their registry
52+
- mise#v1.1.1: ~
53+
6654
- label: ":docker: build image"
6755
depends_on: quality-checks
6856
command: docker build -t buildkite-mcp-server:latest -f Dockerfile.local .

.buildkite/release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66

77
# NOTE: do not exit on non-zero returns codes
8-
set -uo pipefail
8+
set -euo pipefail
99

1010
export GORELEASER_KEY=""
1111
GORELEASER_KEY=$(buildkite-agent secret get goreleaser_key)

Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Variables
22
BINARY_NAME := buildkite-mcp-server
33
CMD_PACKAGE := ./cmd/$(BINARY_NAME)
4-
DOCS_PACKAGE := ./cmd/update-docs
54
COVERAGE_FILE := coverage.out
65

76
# Default target
@@ -25,10 +24,6 @@ install: ## Install the binary
2524
snapshot: ## Build snapshot with goreleaser
2625
goreleaser build --snapshot --clean --single-target
2726

28-
.PHONY: update-docs
29-
update-docs: ## Update documentation
30-
go run $(DOCS_PACKAGE)
31-
3227
.PHONY: run
3328
run: ## Run the application with stdio
3429
go run $(CMD_PACKAGE) stdio

cmd/update-docs/main.go

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

0 commit comments

Comments
 (0)