mirror of
https://github.com/mattermost/mattermost.git
synced 2025-02-25 18:55:24 -06:00
Adding gofmt to travis build
This commit is contained in:
18
Makefile
18
Makefile
@@ -39,6 +39,15 @@ travis:
|
||||
|
||||
@echo Checking for style guide compliance
|
||||
cd web/react && $(ESLINT) --quiet components/* dispatcher/* pages/* stores/* utils/*
|
||||
@echo Running gofmt
|
||||
$(eval GOFMT_OUTPUT := $(shell gofmt -d -s api/ model/ store/ utils/ manualtesting/ mattermost.go 2>&1))
|
||||
@echo "$(GOFMT_OUTPUT)"
|
||||
@if [ ! "$(GOFMT_OUTPUT)" ]; then \
|
||||
echo "gofmt sucess"; \
|
||||
else \
|
||||
echo "gofmt failure"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
@$(GO) build $(GOFLAGS) ./...
|
||||
@$(GO) install $(GOFLAGS) ./...
|
||||
@@ -108,6 +117,15 @@ install:
|
||||
check: install
|
||||
@echo Running ESLint...
|
||||
-cd web/react && $(ESLINT) components/* dispatcher/* pages/* stores/* utils/*
|
||||
@echo Running gofmt
|
||||
$(eval GOFMT_OUTPUT := $(shell gofmt -d -s api/ model/ store/ utils/ manualtesting/ mattermost.go 2>&1))
|
||||
@echo "$(GOFMT_OUTPUT)"
|
||||
@if [[ ! "$(GOFMT_OUTPUT)" ]]; then \
|
||||
echo "gofmt sucess"; \
|
||||
else \
|
||||
echo "gofmt failure"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
test: install
|
||||
@mkdir -p logs
|
||||
|
||||
@@ -12,8 +12,8 @@ const (
|
||||
USER_PASSWORD = "passwd"
|
||||
CHANNEL_TYPE = model.CHANNEL_OPEN
|
||||
FUZZ_USER_EMAIL_PREFIX_LEN = 10
|
||||
BTEST_TEAM_DISPLAY_NAME = "TestTeam"
|
||||
BTEST_TEAM_NAME = "z-z-testdomaina"
|
||||
BTEST_TEAM_DISPLAY_NAME = "TestTeam"
|
||||
BTEST_TEAM_NAME = "z-z-testdomaina"
|
||||
BTEST_TEAM_EMAIL = "test@nowhere.com"
|
||||
BTEST_TEAM_TYPE = model.TEAM_OPEN
|
||||
BTEST_USER_NAME = "Mr. Testing Tester"
|
||||
|
||||
@@ -52,7 +52,7 @@ func (cfg *AutoTeamCreator) createRandomTeam() (*model.Team, bool) {
|
||||
}
|
||||
team := &model.Team{
|
||||
DisplayName: teamDisplayName,
|
||||
Name: teamName,
|
||||
Name: teamName,
|
||||
Email: teamEmail,
|
||||
Type: model.TEAM_OPEN,
|
||||
}
|
||||
|
||||
@@ -439,10 +439,10 @@ func IsBetaDomain(r *http.Request) bool {
|
||||
}
|
||||
|
||||
var privateIpAddress = []*net.IPNet{
|
||||
&net.IPNet{IP: net.IPv4(10, 0, 0, 1), Mask: net.IPv4Mask(255, 0, 0, 0)},
|
||||
&net.IPNet{IP: net.IPv4(176, 16, 0, 1), Mask: net.IPv4Mask(255, 255, 0, 0)},
|
||||
&net.IPNet{IP: net.IPv4(192, 168, 0, 1), Mask: net.IPv4Mask(255, 255, 255, 0)},
|
||||
&net.IPNet{IP: net.IPv4(127, 0, 0, 1), Mask: net.IPv4Mask(255, 255, 255, 252)},
|
||||
{IP: net.IPv4(10, 0, 0, 1), Mask: net.IPv4Mask(255, 0, 0, 0)},
|
||||
{IP: net.IPv4(176, 16, 0, 1), Mask: net.IPv4Mask(255, 255, 0, 0)},
|
||||
{IP: net.IPv4(192, 168, 0, 1), Mask: net.IPv4Mask(255, 255, 255, 0)},
|
||||
{IP: net.IPv4(127, 0, 0, 1), Mask: net.IPv4Mask(255, 255, 255, 252)},
|
||||
}
|
||||
|
||||
func IsPrivateIpAddress(ipAddress string) bool {
|
||||
|
||||
@@ -86,7 +86,7 @@ func uploadFile(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
for i, _ := range files {
|
||||
for i := range files {
|
||||
file, err := files[i].Open()
|
||||
defer file.Close()
|
||||
if err != nil {
|
||||
|
||||
@@ -353,7 +353,7 @@ func fireAndForgetNotifications(post *model.Post, teamId, siteURL string) {
|
||||
}
|
||||
}
|
||||
|
||||
for id, _ := range toEmailMap {
|
||||
for id := range toEmailMap {
|
||||
fireAndForgetMentionUpdate(post.ChannelId, id)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ type ChannelCounts struct {
|
||||
func (o *ChannelCounts) Etag() string {
|
||||
|
||||
ids := []string{}
|
||||
for id, _ := range o.Counts {
|
||||
for id := range o.Counts {
|
||||
ids = append(ids, id)
|
||||
}
|
||||
sort.Strings(ids)
|
||||
|
||||
@@ -440,7 +440,7 @@ func (s SqlChannelStore) GetExtraMembers(channelId string, limit int) StoreChann
|
||||
if err != nil {
|
||||
result.Err = model.NewAppError("SqlChannelStore.GetExtraMembers", "We couldn't get the extra info for channel members", "channel_id="+channelId+", "+err.Error())
|
||||
} else {
|
||||
for i, _ := range members {
|
||||
for i := range members {
|
||||
members[i].Sanitize(utils.SanitizeOptions)
|
||||
}
|
||||
result.Data = members
|
||||
|
||||
Reference in New Issue
Block a user