File tree 8 files changed +9
-94
lines changed
8 files changed +9
-94
lines changed Original file line number Diff line number Diff line change 1
1
.PHONY : validate verify verify_ruby verify_golang test test_ruby test_golang setup _install build compile check clean
2
2
3
- GO_SOURCES := $(shell find go -name '* .go')
3
+ GO_SOURCES := $(shell find . -name '* .go')
4
4
5
5
validate : verify test
6
6
@@ -10,7 +10,7 @@ verify_ruby:
10
10
bundle exec rubocop
11
11
12
12
verify_golang :
13
- support/go-format check
13
+ gofmt -s -l $( GO_SOURCES )
14
14
15
15
test : test_ruby test_golang
16
16
@@ -19,7 +19,7 @@ test_ruby:
19
19
bundle exec rspec --color --format d spec
20
20
21
21
test_golang :
22
- support/go- test
22
+ go test ./...
23
23
24
24
setup : _install bin/gitlab-shell
25
25
@@ -29,10 +29,10 @@ _install:
29
29
build : bin/gitlab-shell
30
30
compile : bin/gitlab-shell
31
31
bin/gitlab-shell : $(GO_SOURCES )
32
- bin/compile
32
+ GOBIN= " $( CURDIR ) / bin" go install ./cmd/...
33
33
34
34
check :
35
35
bin/check
36
36
37
37
clean :
38
- rm -f bin/gitlab-shell bin/gitlab-shell-authorized-keys-check bin/gitlab-shell-authorized-principals-check
38
+ rm -f bin/check bin/ gitlab-shell bin/gitlab-shell-authorized-keys-check bin/gitlab-shell-authorized-principals-check
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1
1
#!/usr/bin/env ruby
2
2
3
3
# Load ROOT_PATH and access the minimum necessary config file
4
- require_relative '../support/go_build'
5
4
require_relative '../support/gitlab_config'
6
5
7
6
config = GitlabConfig . new
Original file line number Diff line number Diff line change 1
- module gitlab.com/gitlab-org/gitlab-shell/go
1
+ module gitlab.com/gitlab-org/gitlab-shell
2
2
3
3
go 1.12
4
4
5
5
require (
6
6
github.com/mattn/go-shellwords v0.0.0-20190425161501-2444a32a19f4
7
7
github.com/otiai10/copy v1.0.1
8
- github.com/otiai10/curr v0.0.0-20190513014714-f5a3d24e5776 // indirect
9
8
github.com/sirupsen/logrus v1.2.0
10
9
github.com/stretchr/testify v1.3.0
11
10
gitlab.com/gitlab-org/gitaly v1.68.0
12
11
gitlab.com/gitlab-org/labkit v0.0.0-20190221122536-0c3fc7cdd57c
13
12
google.golang.org/grpc v1.24.0
14
- gopkg.in/DataDog/dd-trace-go.v1 v1.9.0 // indirect
15
13
gopkg.in/yaml.v2 v2.2.2
16
14
)
Original file line number Diff line number Diff line change 1
1
require 'yaml'
2
2
3
+ # Determine the root of the gitlab-shell directory
4
+ ROOT_PATH = ENV . fetch ( 'GITLAB_SHELL_DIR' , File . expand_path ( '..' , __dir__ ) )
5
+
3
6
class GitlabConfig
4
7
attr_reader :config
5
8
Load Diff This file was deleted.
Load Diff This file was deleted.
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments