Skip to content

Commit 4380f34

Browse files
authored
Merge branch 'device-management-toolkit:main' into main
2 parents 9f9a036 + 2f93205 commit 4380f34

File tree

16 files changed

+18
-1840
lines changed

16 files changed

+18
-1840
lines changed

.env.example

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
DISABLE_SWAGGER_HTTP_HANDLER=true
21
GIN_MODE=release
32
# DB_URL=postgres://postgresadmin:admin123@localhost:5432/rpsdb
43
# OAUTH CONFIGURATION

.github/workflows/release.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,16 @@ jobs:
180180
with:
181181
node-version: 22.x
182182

183-
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
183+
# Pin Go only for license generation
184+
- name: Use Go 1.25.1 for license scan
185+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
184186
with:
185-
go-version: ">=1.23.0"
187+
go-version: "1.25.1"
188+
check-latest: true
189+
- name: Pin toolchain for this step
190+
run: |
191+
go version
192+
go env -w GOTOOLCHAIN=local
186193
187194
- name: Checkout Sample Web UI for license scan
188195
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,9 @@ compose-down: ### Down docker compose
2424
docker compose down --remove-orphans
2525
.PHONY: compose-down
2626

27-
swag-v1: ### swag init
28-
swag init -g internal/controller/http/v1/router.go
29-
.PHONY: swag-v1
30-
3127
run: ### run app
3228
go mod tidy && go mod download && \
33-
DISABLE_SWAGGER_HTTP_HANDLER='' GIN_MODE=debug CGO_ENABLED=0 go run ./cmd/app
29+
GIN_MODE=debug CGO_ENABLED=0 go run ./cmd/app
3430
.PHONY: run
3531

3632
docker-rm-volume: ### remove docker volume

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ cp .env.example .env
9494
Edit `.env` as needed. For local dev, set:
9595

9696
```sh
97-
DISABLE_SWAGGER_HTTP_HANDLER=true
9897
GIN_MODE=debug
9998
# DB_URL=postgres://postgresadmin:admin123@localhost:5432/rpsdb # uncomment for Postgres
10099
```

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services:
55
networks:
66
- openamtnetwork1
77
volumes:
8-
- pg-data:/var/lib/postgresql/data
8+
- pg-data:/var/lib/postgresql
99
environment:
1010
POSTGRES_USER: "postgresadmin"
1111
POSTGRES_PASSWORD: "admin123"

0 commit comments

Comments
 (0)