Skip to content

Commit

Permalink
Revert "Move citool.go to citool/main.go" (#5)
Browse files Browse the repository at this point in the history
This reverts commit 31b6755.
  • Loading branch information
ashishb committed Jul 22, 2019
1 parent 6cc98b2 commit 34e5a0a
Show file tree
Hide file tree
Showing 15 changed files with 11 additions and 12 deletions.
1 change: 0 additions & 1 deletion .gitignore
Expand Up @@ -15,4 +15,3 @@

# Default directory for temporary Circle CI data
circleci_data
bin/
18 changes: 9 additions & 9 deletions Makefile
@@ -1,23 +1,23 @@
.PHONY: clean
.PHONY: test

SOURCES=citool/main.go $(wildcard src/citool/*.go)
EXECUTABLE=bin/citool
SOURCES=citool.go $(wildcard src/citool/*.go)
EXECUTABLE=citool

build: $(SOURCES)
GO111MODULE=on go build -o $(EXECUTABLE) citool/main.go
citool: $(SOURCES)
GO111MODULE=on go build -o bin/$(EXECUTABLE) citool.go

clean:
GO111MODULE=on go clean citool/main.go
GO111MODULE=on go clean citool.go
rm -rf $(EXECUTABLE)

format:
gofmt -w -s citool/main.go citool/src/citool/*
gofmt -w -s citool.go src/citool/*

lint:
GO111MODULE=on go mod tidy
GO111MODULE=on go vet citool/main.go
GO111MODULE=on go vet citool/src/citool/*
golint -set_exit_status citool/src/citool/
GO111MODULE=on go vet citool.go
GO111MODULE=on go vet src/citool/*
golint -set_exit_status src/ src/citool/
test:
./test.sh
2 changes: 1 addition & 1 deletion citool/main.go → citool.go
Expand Up @@ -3,7 +3,7 @@ package main
import (
"flag"
"fmt"
"github.com/ashishb/ci-analysis-tool/citool/src/citool"
"github.com/ashishb/ci-analysis-tool/src/citool"
"io/ioutil"
"os"
"path/filepath"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion test.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -euo pipefail

GO111MODULE=on go run citool/main.go --mode analyze --print-duration-graph=false --print-success-graph=false --input-files test/circleci_data/*.json > test/analyze_actual_output.txt
GO111MODULE=on go run citool.go --mode analyze --print-duration-graph=false --print-success-graph=false --input-files test/circleci_data/*.json > test/analyze_actual_output.txt
diff test/analyze_actual_output.txt test/analyze_expected_output.txt
rm test/analyze_actual_output.txt

Expand Down

0 comments on commit 34e5a0a

Please sign in to comment.