Skip to content

Commit 87c9c84

Browse files
committed
deal with swagger, remove install_buildtools.sh and check_deps.sh
1 parent 5b4b64c commit 87c9c84

File tree

8 files changed

+7
-191
lines changed

8 files changed

+7
-191
lines changed

AGENTS.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ To verify that this wasn't missed, we run verification steps, which can be found
5050
### Development Setup
5151
```bash
5252
./scripts/configure_dev.sh # Initial environment setup
53-
./scripts/buildtools/install_buildtools.sh # Install build tools
54-
make deps # Check/install dependencies
5553
```
5654

5755
### Single Test Execution

Makefile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ cover:
135135
prof:
136136
cd node && go test $(GOTAGS) -cpuprofile=cpu.out -memprofile=mem.out -mutexprofile=mutex.out
137137

138-
generate: deps
138+
generate:
139139
PATH=$(GOBIN):$$PATH go generate ./...
140140

141141
msgp: $(patsubst %,%/msgp_gen.go,$(MSGP_GENERATE))
@@ -226,9 +226,6 @@ else
226226
echo "OS_TYPE must be darwin for universal builds, skipping"
227227
endif
228228

229-
deps:
230-
./scripts/check_deps.sh
231-
232229
# artifacts
233230

234231
# Regenerate kmd swagger spec files
@@ -255,15 +252,15 @@ $(KMD_API_SWAGGER_SPEC): $(KMD_API_FILES) crypto/libs/$(OS_TYPE)/$(ARCH)/lib/lib
255252
touch $@; \
256253
fi
257254

258-
$(KMD_API_SWAGGER_INJECT): deps $(KMD_API_SWAGGER_SPEC) $(KMD_API_SWAGGER_SPEC).validated
255+
$(KMD_API_SWAGGER_INJECT): $(KMD_API_SWAGGER_SPEC) $(KMD_API_SWAGGER_SPEC).validated
259256
./daemon/kmd/lib/kmdapi/bundle_swagger_json.sh
260257

261258
# generated files we should make sure we clean
262259
GENERATED_FILES := \
263260
$(KMD_API_SWAGGER_INJECT) \
264261
$(KMD_API_SWAGGER_SPEC) $(KMD_API_SWAGGER_SPEC).validated
265262

266-
rebuild_kmd_swagger: deps
263+
rebuild_kmd_swagger:
267264
rm -f $(GENERATED_FILES)
268265
# we need to invoke the make here since we want to ensure that the deletion and re-creating are sequential
269266
make $(KMD_API_SWAGGER_INJECT)
@@ -410,7 +407,7 @@ dump: $(addprefix gen/,$(addsuffix /genesis.dump, $(NETWORKS)))
410407
install: build
411408
scripts/dev_install.sh -p $(GOBIN)
412409

413-
.PHONY: default fmt lint check_shell sanity cover prof deps build build-race build-e2e test fulltest shorttest clean cleango deploy node_exporter install %gen gen NONGO_BIN check-go-version rebuild_kmd_swagger universal libsodium modernize
410+
.PHONY: default fmt lint check_shell sanity cover prof build build-race build-e2e test fulltest shorttest clean cleango deploy node_exporter install %gen gen NONGO_BIN check-go-version rebuild_kmd_swagger universal libsodium modernize
414411

415412
###### TARGETS FOR CICD PROCESS ######
416413
include ./scripts/release/mule/Makefile.mule

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ We currently strive to support Debian-based distributions, with Ubuntu 24.04 as
3131
git clone https://github.com/algorand/go-algorand
3232
cd go-algorand
3333
./scripts/configure_dev.sh
34-
./scripts/buildtools/install_buildtools.sh
3534
```
3635

3736
At this point, you are ready to build go-algorand. We use `make` and have several targets to automate common tasks.

daemon/kmd/api/api.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
// Base path must be a fully specified package name (else, it seems that swagger feeds a relative path to
6060
// loader.Config.Import(), and that breaks the vendor directory if the source is symlinked from elsewhere)
6161
//
62-
//go:generate swagger generate spec -m --transparent-aliases -o="./swagger.json"
63-
//go:generate swagger validate ./swagger.json --stop-on-error
62+
//go:generate go run github.com/algorand/go-swagger/cmd/swagger@v0.0.0-20251018003531-2ea7c750dcac generate spec -m --transparent-aliases -o="./swagger.json"
63+
//go:generate go run github.com/algorand/go-swagger/cmd/swagger@v0.0.0-20251018003531-2ea7c750dcac validate ./swagger.json --stop-on-error
6464
//go:generate sh ../lib/kmdapi/bundle_swagger_json.sh
6565
package api
6666

@@ -70,7 +70,7 @@ import (
7070

7171
"github.com/gorilla/mux"
7272

73-
"github.com/algorand/go-algorand/daemon/kmd/api/v1"
73+
v1 "github.com/algorand/go-algorand/daemon/kmd/api/v1"
7474
"github.com/algorand/go-algorand/daemon/kmd/lib/kmdapi"
7575
"github.com/algorand/go-algorand/daemon/kmd/session"
7676
"github.com/algorand/go-algorand/logging"

scripts/buildtools/install_buildtools.sh

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

scripts/buildtools/versions

Lines changed: 0 additions & 1 deletion
This file was deleted.

scripts/check_deps.sh

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

scripts/travis/codegen_verification.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ touch gen/generate.go
2020

2121
make build
2222

23-
"${SCRIPTPATH}"/../buildtools/install_buildtools.sh
24-
2523
make gen SHORT_PART_PERIOD=1
2624

2725
echo "Running check_license..."

0 commit comments

Comments
 (0)