Skip to content

Commit f08ab7d

Browse files
authored
Add Github Action badge and remove duplicated CI. (google#547)
* Add Github Action badge and remove duplicated ci * Remove comments
1 parent eab82f0 commit f08ab7d

File tree

4 files changed

+17
-41
lines changed

4 files changed

+17
-41
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
matrix:
1919
go: ['1.13', '1.14']
2020
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']
2222
steps:
2323
- name: Update go version
2424
uses: actions/setup-go@v2
@@ -120,11 +120,6 @@ jobs:
120120
uses: actions/setup-go@v2
121121
with:
122122
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
128123

129124
- name: Checkout the repo
130125
uses: actions/checkout@v2

.travis.yml

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -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.
13
language: go
24

35
go_import_path: github.com/google/pprof
46

57
matrix:
68
include:
7-
- os: linux
8-
go: 1.13.x
9-
- os: linux
10-
go: 1.14.x
119
- os: linux
1210
go: master
1311
- 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
1914
- os: osx
20-
osx_image: xcode8.3
15+
osx_image: xcode11
2116
go: master
2217
- os: osx
23-
osx_image: xcode9.4
24-
go: 1.13.x
18+
osx_image: xcode11.1
19+
go: master
2520
- os: osx
26-
osx_image: xcode9.4
27-
go: 1.14.x
21+
osx_image: xcode11.2
22+
go: master
2823
- os: osx
29-
osx_image: xcode9.4
24+
osx_image: xcode11.3
3025
go: master
3126
- os: osx
32-
osx_image: xcode10.1
33-
go: 1.13.x
27+
osx_image: xcode11.4
28+
go: master
3429
- os: osx
35-
osx_image: xcode10.1
36-
go: 1.14.x
30+
osx_image: xcode11.5
31+
go: master
3732
- os: osx
38-
osx_image: xcode10.1
33+
osx_image: xcode11.6
3934
go: master
4035

4136
addons:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
![](https://github.com/google/pprof/workflows/ci/badge.svg)
12
[![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)
33
[![codecov](https://codecov.io/gh/google/pprof/graph/badge.svg)](https://codecov.io/gh/google/pprof)
44

55
# Introduction

appveyor.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)