Browse Source

Add Github Action badge and remove duplicated CI. (#547)

* Add Github Action badge and remove duplicated ci

* Remove comments
Garrett Wang 4 years ago
parent
commit
f08ab7df92
No account linked to committer's email address
4 changed files with 17 additions and 41 deletions
  1. 1
    6
      .github/workflows/ci.yaml
  2. 15
    20
      .travis.yml
  3. 1
    1
      README.md
  4. 0
    14
      appveyor.yml

+ 1
- 6
.github/workflows/ci.yaml View File

@@ -18,7 +18,7 @@ jobs:
18 18
       matrix:
19 19
         go: ['1.13', '1.14']
20 20
         os: ['macos-10.15']
21
-        xcode-version: ['11.5', '10.3']
21
+        xcode-version: ['11.6', '11.5', '11.4.1', '11.3.1', '11.2.1', '11.1', '11.0', '10.3']
22 22
     steps:
23 23
       - name: Update go version
24 24
         uses: actions/setup-go@v2
@@ -120,11 +120,6 @@ jobs:
120 120
         uses: actions/setup-go@v2
121 121
         with:
122 122
           go-version: ${{ matrix.go }}
123
-      
124
-          # - name: Make sure line endings work correctly on Windows
125
-          #    run: |
126
-          #      git config --global core.eol lf
127
-          #      git config --global core.autocrlf input
128 123
 
129 124
       - name: Checkout the repo
130 125
         uses: actions/checkout@v2

+ 15
- 20
.travis.yml View File

@@ -1,41 +1,36 @@
1
+# Once https://github.com/actions/setup-go/pull/34 is finished, we can remove
2
+# travis.ci altogether and move everything to Github Action.
1 3
 language: go
2 4
 
3 5
 go_import_path: github.com/google/pprof
4 6
 
5 7
 matrix:
6 8
   include:
7
-    - os: linux
8
-      go: 1.13.x
9
-    - os: linux
10
-      go: 1.14.x
11 9
     - os: linux
12 10
       go: master
13 11
     - os: osx
14
-      osx_image: xcode8.3
15
-      go: 1.13.x
16
-    - os: osx
17
-      osx_image: xcode8.3
18
-      go: 1.14.x
12
+      osx_image: xcode10.3
13
+      go: master
19 14
     - os: osx
20
-      osx_image: xcode8.3
15
+      osx_image: xcode11
21 16
       go: master
22 17
     - os: osx
23
-      osx_image: xcode9.4
24
-      go: 1.13.x
18
+      osx_image: xcode11.1
19
+      go: master
25 20
     - os: osx
26
-      osx_image: xcode9.4
27
-      go: 1.14.x
21
+      osx_image: xcode11.2
22
+      go: master
28 23
     - os: osx
29
-      osx_image: xcode9.4
24
+      osx_image: xcode11.3
30 25
       go: master
31 26
     - os: osx
32
-      osx_image: xcode10.1
33
-      go: 1.13.x
27
+      osx_image: xcode11.4
28
+      go: master
34 29
     - os: osx
35
-      osx_image: xcode10.1
36
-      go: 1.14.x
30
+      osx_image: xcode11.5
31
+      go: master
37 32
     - os: osx
38
-      osx_image: xcode10.1
33
+      osx_image: xcode11.6
39 34
       go: master
40 35
 
41 36
 addons:

+ 1
- 1
README.md View File

@@ -1,5 +1,5 @@
1
+![](https://github.com/google/pprof/workflows/ci/badge.svg)
1 2
 [![Build Status](https://travis-ci.org/google/pprof.svg?branch=master)](https://travis-ci.org/google/pprof)
2
-[![Build status](https://ci.appveyor.com/api/projects/status/ucu3k9t263f8syn3?svg=true)](https://ci.appveyor.com/project/gwpappveyor/pprof)
3 3
 [![codecov](https://codecov.io/gh/google/pprof/graph/badge.svg)](https://codecov.io/gh/google/pprof)
4 4
 
5 5
 # Introduction

+ 0
- 14
appveyor.yml View File

@@ -1,14 +0,0 @@
1
-clone_folder: c:\gopath\src\github.com\google\pprof
2
-
3
-environment:
4
-  GOPATH: c:\gopath
5
-
6
-install:
7
- - cinst graphviz
8
-
9
-build_script:
10
- - go env
11
- - go build github.com/google/pprof
12
-
13
-test_script:
14
-  - go test -v ./...