Skip to content
This repository has been archived by the owner on Jun 13, 2024. It is now read-only.

Update CI build matrix for travis and appveyor #35

Merged
merged 12 commits into from
Aug 10, 2017

Conversation

fs-eire
Copy link
Contributor

@fs-eire fs-eire commented Aug 10, 2017

  • Use a fully customized matrix on travis
  • Fix CMake missing on ubuntu precise
  • Add AppVeyor support

@msftclas
Copy link

@fs-eire,
Thanks for your contribution as a Microsoft full-time employee or intern. You do not need to sign a CLA.
Thanks,
Microsoft Pull Request Bot

.travis.yml Outdated
- g++-5
env:
- COMPILER_OVERRIDE="CXX=g++-5 CC=gcc-5"
# Node LTS (6.x) OS X (Yosemite) AppleClang 6.1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AppleClang is actually LLVM.

package.json Outdated
@@ -1,6 +1,6 @@
{
"name": "napajs",
"version": "0.1.0",
"version": "0.1.1",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not needed? since we don't change napajs distributables.

daiyip
daiyip previously approved these changes Aug 10, 2017
Copy link
Contributor

@daiyip daiyip left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please address comments and merge.

.travis.yml Outdated
apt:
sources:
- ubuntu-toolchain-r-test
- george-edison55-precise-backports
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this for?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'ubuntu-toolchain-r-test' is for g++5/g++6
'george-edison55-precise-backports' is for CMake 3.2+

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add comment for these two?

Copy link
Contributor

@daiyip daiyip left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please address the rest 2 comments.

@@ -0,0 +1,26 @@
environment:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please also add appveyor.yml to .npmignore.

@@ -1,3 +1,8 @@
[![Build Status for Linux/MacOS](https://travis-ci.org/Microsoft/napajs.svg?branch=master)](https://travis-ci.org/Microsoft/napajs)
[![Build Status for Windows](https://ci.appveyor.com/api/projects/status/github/Microsoft/napajs?branch=master&svg=true)](https://ci.appveyor.com/project/daiyip/napajs)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both icons are showing 'build', is it possible to customize the text on the icon?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given travis is not customizable, let's keep the two 'build' for now.

daiyip
daiyip previously approved these changes Aug 10, 2017
@daiyip daiyip merged commit 85f46c0 into master Aug 10, 2017
@fs-eire fs-eire deleted the dev/eire/update-travis-matrix branch October 19, 2017 02:25
daiyip pushed a commit that referenced this pull request Jan 19, 2018
* Update travis customized matrix

* Fix default build matrix

* Update travis build matrix

* Add AppVeyor configuration

* remove 2 targets from matrix

* Update package version

* Update xcode version from 8.2 to 7.3

* Update badges to README.md

* Update badges for both travis (Linux/OSX) and appveyor (Windows)

* Add comments on apt sources in travis config

* add file appveyor.yml to npm ignore list

* revert package version to 0.1.0
daiyip pushed a commit that referenced this pull request Jan 19, 2018
* Update travis customized matrix

* Fix default build matrix

* Update travis build matrix

* Add AppVeyor configuration

* remove 2 targets from matrix

* Update package version

* Update xcode version from 8.2 to 7.3

* Update badges to README.md

* Update badges for both travis (Linux/OSX) and appveyor (Windows)

* Add comments on apt sources in travis config

* add file appveyor.yml to npm ignore list

* revert package version to 0.1.0
daiyip pushed a commit that referenced this pull request Jan 19, 2018
* Update travis customized matrix

* Fix default build matrix

* Update travis build matrix

* Add AppVeyor configuration

* remove 2 targets from matrix

* Update package version

* Update xcode version from 8.2 to 7.3

* Update badges to README.md

* Update badges for both travis (Linux/OSX) and appveyor (Windows)

* Add comments on apt sources in travis config

* add file appveyor.yml to npm ignore list

* revert package version to 0.1.0
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants