Merge branch 'remove-docsgo' into 'main'

Remove api/docs/docs.go from version control and update CI build process

See merge request aura/tank!23

.gitignore

@@ -6,3 +6,4 @@
 /api/docs/swagger.*
 /.hypothesis
 .idea/
+/api/docs/docs.go
\ No newline at end of file

.gitlab-ci.yml

@@ -69,10 +69,9 @@ test-all:
 build:
   stage: build
   script:
-    # we should actually use `make build` here, see #30
-    - go build -ldflags "-extldflags '-static'" -tags netgo -o $CI_PROJECT_DIR/tank ./cmd/tank
-    ## sqlite needs cgo... :(
-    ##- go build -o $CI_PROJECT_DIR/tank ./cmd/tank
+    # ensure dependencies are installed before running make
+    - apt-get update && apt-get install -y make
+    - make build
   rules: *feature-rules
   artifacts:
     paths:

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 
 - `Playlist` and `PlaylistEntry` models and migrations, `playlists` API routes and related code. (tank#83)
+- Generated docs.go from version control were removed (tank#30)
 
 ## [1.0.0-alpha5] - 2024-10-23
 

Makefile

@@ -34,7 +34,7 @@ EXECUTABLE := tank
 version := $(shell grep -oP 'app\.Version = "\K(.*)(?=")' cmd/tank/main.go)
 
 all: build
-.PHONY: vet format ui build clean distclean
+.PHONY: vet format ui build clean distclean api-docs
 
 init.dev::
 	go get -u github.com/swaggo/swag/cmd/swag
@@ -59,10 +59,10 @@ api-docs:
 # build target actually depends on api-docs
 # to allow building binary without generating api docs first, we put api/docs/docs.go under version control
 # see #30
-build: ui
+build: ui api-docs
 	$(GOCMD) build -o $(EXECUTABLE) ./cmd/tank
 
-dev:
+dev: api-docs
 	$(GOCMD) build -o $(EXECUTABLE) -tags=dev ./cmd/tank
 
 test-all: