REORG/MINOR: make: unite make models and equal

both needs to be executed always one after another, so it only make sense to have them more tightly coupled

.gitlab-ci.yml

@@ -54,9 +54,9 @@ generate:
     - go
   before_script:
     - rm -rf models/*
-    - make models equal
+    - make models
   script:
-    - test -z "$(git diff 2> /dev/null)" || exit "Models are not generated, issue \`make models equal\` and commit the result"
+    - test -z "$(git diff 2> /dev/null)" || exit "Models are not generated, issue \`make models\` and commit the result"
     - test -z "$(git ls-files --others --exclude-standard 2> /dev/null)" || exit "Models generation created untracked files, cannot proceed"
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

Makefile

@@ -22,15 +22,12 @@ e2e-docker:
 spec:
 	go run specification/build/build.go -file specification/haproxy-spec.yaml > specification/build/haproxy_spec.yaml
 
-.PHONY: equal
-equal:
-	rm -rf models/*_compare.go
-	rm -rf models/*_compare_test.go
-	go run cmd/struct_equal_generator/*.go -l ${PROJECT_PATH}/specification/copyright.txt ${PROJECT_PATH}/models
-
 .PHONY: models
 models: spec swagger-check
 	./bin/swagger generate model --additional-initialism=FCGI -f ${PROJECT_PATH}/specification/build/haproxy_spec.yaml -r ${PROJECT_PATH}/specification/copyright.txt -m models -t ${PROJECT_PATH}
+	rm -rf models/*_compare.go
+	rm -rf models/*_compare_test.go
+	go run cmd/struct_equal_generator/*.go -l ${PROJECT_PATH}/specification/copyright.txt ${PROJECT_PATH}/models
 
 .PHONY: swagger-check
 swagger-check: