Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
telegraf-nftables
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Due to inactivity, this project is scheduled to be deleted on 2035-04-24.
Why is this scheduled?
Show more breadcrumbs
vqgroup
telegraf-nftables
Commits
1f87c10d
Unverified
Commit
1f87c10d
authored
7 years ago
by
Daniel Nelson
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix Makefile on Windows and use in AppVeyor build (#3748)
parent
281f4d36
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile
+1
-1
1 addition, 1 deletion
Makefile
appveyor.yml
+7
-6
7 additions, 6 deletions
appveyor.yml
with
8 additions
and
7 deletions
Makefile
+
1
−
1
View file @
1f87c10d
...
@@ -2,7 +2,7 @@ PREFIX := /usr/local
...
@@ -2,7 +2,7 @@ PREFIX := /usr/local
VERSION
:=
$(
shell git describe
--exact-match
--tags
2>/dev/null
)
VERSION
:=
$(
shell git describe
--exact-match
--tags
2>/dev/null
)
BRANCH
:=
$(
shell git rev-parse
--abbrev-ref
HEAD
)
BRANCH
:=
$(
shell git rev-parse
--abbrev-ref
HEAD
)
COMMIT
:=
$(
shell git rev-parse
--short
HEAD
)
COMMIT
:=
$(
shell git rev-parse
--short
HEAD
)
GOFILES
?=
$(
shell
find
.
-name
'*.go'
)
GOFILES
?=
$(
shell
git ls-files
'*.go'
)
GOFMT
?=
$(
shell gofmt
-l
$(
GOFILES
))
GOFMT
?=
$(
shell gofmt
-l
$(
GOFILES
))
ifdef
GOBIN
ifdef
GOBIN
...
...
This diff is collapsed.
Click to expand it.
appveyor.yml
+
7
−
6
View file @
1f87c10d
...
@@ -13,20 +13,21 @@ platform: x64
...
@@ -13,20 +13,21 @@ platform: x64
install
:
install
:
-
IF NOT EXIST "C:\Cache" mkdir C:\Cache
-
IF NOT EXIST "C:\Cache" mkdir C:\Cache
-
IF NOT EXIST "C:\Cache\go1.9.2.msi" curl -o "C:\Cache\go1.9.2.msi" https://storage.googleapis.com/golang/go1.9.2.windows-amd64.msi
-
IF NOT EXIST "C:\Cache\go1.9.2.msi" curl -o "C:\Cache\go1.9.2.msi" https://storage.googleapis.com/golang/go1.9.2.windows-amd64.msi
-
IF NOT EXIST "C:\Cache\gnuwin32-bin.zip" curl -o "C:\Cache\gnuwin32-bin.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-bin.zip
-
IF NOT EXIST "C:\Cache\gnuwin32-dep.zip" curl -o "C:\Cache\gnuwin32-dep.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-dep.zip
-
IF EXIST "C:\Go" rmdir /S /Q C:\Go
-
IF EXIST "C:\Go" rmdir /S /Q C:\Go
-
msiexec.exe /i "C:\Cache\go1.9.2.msi" /quiet
-
msiexec.exe /i "C:\Cache\go1.9.2.msi" /quiet
-
7z x "C:\Cache\gnuwin32-bin.zip" -oC:\GnuWin32 -y
-
7z x "C:\Cache\gnuwin32-dep.zip" -oC:\GnuWin32 -y
-
go version
-
go version
-
go env
-
go env
build_script
:
build_script
:
-
cmd
:
go get github.com/sparrc/gdm
-
cmd
:
C:\GnuWin32\bin\make deps
-
cmd
:
C:\gopath\bin\gdm restore
-
cmd
:
C:\GnuWin32\bin\make telegraf
-
cmd
:
go build -i -o telegraf.exe ./cmd/telegraf/telegraf.go
test_script
:
test_script
:
-
cmd
:
go test ./plugins/inputs/ping/...
-
cmd
:
C:\GnuWin32\bin\make test-windows
-
cmd
:
go test ./plugins/inputs/win_perf_counters/...
-
cmd
:
go test ./plugins/inputs/win_services/...
artifacts
:
artifacts
:
-
path
:
telegraf.exe
-
path
:
telegraf.exe
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment