Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: getting CI running #7

Merged
merged 17 commits into from
May 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions .kokoro/continuous/node6/common.cfg

This file was deleted.

Empty file removed .kokoro/continuous/node6/test.cfg
Empty file.
10 changes: 6 additions & 4 deletions .kokoro/lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@ cd $(dirname $0)/..
npm install

# Install and link samples
cd samples/
npm link ../
npm install
cd ..
if [ -f samples/package.json ]; then
cd samples/
npm link ../
npm install
cd ..
fi

npm run lint
24 changes: 0 additions & 24 deletions .kokoro/presubmit/node6/common.cfg

This file was deleted.

Empty file removed .kokoro/presubmit/node6/test.cfg
Empty file.
16 changes: 9 additions & 7 deletions .kokoro/samples-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,14 @@ if [ -f .kokoro/pre-samples-test.sh ]; then
set -x
fi

npm install
if [ -f samples/package.json ]; then
npm install

# Install and link samples
cd samples/
npm link ../
npm install
cd ..
# Install and link samples
cd samples/
npm link ../
npm install
cd ..

npm run samples-test
npm run samples-test
fi
12 changes: 10 additions & 2 deletions .kokoro/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ cd $(dirname $0)/..

npm install
npm test
./node_modules/nyc/bin/nyc.js report

bash $KOKORO_GFILE_DIR/codecov.sh
COVERAGE_NODE=10
if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then
NYC_BIN=./node_modules/nyc/bin/nyc.js
if [ -f "$NYC_BIN" ]; then
$NYC_BIN report
fi
bash $KOKORO_GFILE_DIR/codecov.sh
else
echo "coverage is only reported for Node $COVERAGE_NODE"
fi
60 changes: 27 additions & 33 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
"bin": "./build/src/bin/release-please.js",
"scripts": {
"test": "cross-env ENVIRONMENT=test c8 --reporter=html --reporter=text mocha --recursive --timeout=5000 build/test",
"docs-test": "echo add docs tests",
"system-test": "cross-env ENVIRONMENT=test mocha --timeout=20000 build/system-test",
"presystem-test": "npm run compile",
"test:all": "cross-env ENVIRONMENT=test c8 --reporter=html --reporter=text mocha --recursive --timeout=20000 build/system-test build/test",
"test:snap": "SNAPSHOT_UPDATE=1 npm test",
"clean": "gts clean",
Expand Down Expand Up @@ -36,7 +38,7 @@
"@types/mocha": "^5.2.6",
"@types/node": "^11.13.6",
"@types/semver": "^6.0.0",
"c8": "^4.0.0-candidate.0",
"c8": "^4.1.4",
"chai": "^4.2.0",
"cross-env": "^5.2.0",
"gts": "^0.9.0",
Expand Down
2 changes: 1 addition & 1 deletion synth.metadata
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"updateTime": "2019-05-01T11:24:51.301043Z",
"updateTime": "2019-05-03T20:45:16.861987Z",
"sources": [
{
"template": {
Expand Down
73 changes: 2 additions & 71 deletions system-test/github.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,7 @@ describe('GitHub', () => {
return res;
});
});
latestTag.should.eql({
name: 'v0.5.0',
version: '0.5.0',
sha: 'c16bcdee9fbac799c8ffb28d7447487a7f94b929'
});
latestTag.sha.should.match(/[a-z0-9]{40}/);
});
});

Expand All @@ -96,10 +92,7 @@ describe('GitHub', () => {
return res;
});
});
commitsSinceSha[0].should.include(
'chore(deps): update dependency @types/nock to v10');
commitsSinceSha[commitsSinceSha.length - 1].should.include(
'define regexp only once in circleci config');
commitsSinceSha.length.should.be.gt(2);
});
});

Expand All @@ -121,67 +114,5 @@ describe('GitHub', () => {
});
});
});

describe('user has write permissions', () => {
it('creates branch with updated content, if file in updates array exists',
async () => {
const version = '7.0.0';
const branch = `release-${version}`;
const gh = new GitHub({
token: process.env.GH_TOKEN,
owner: 'bcoe',
repo: 'examples-conventional-commits'
});
const cl = new FakeFileUpdater({
path: 'CHANGELOG.md',
version,
changelogEntry: 'fixed all the things',
packageName: '@google-cloud/foo'
});
const ref = await nockBack('open-pr-update-file.json')
.then(async (nbr: NockBackResponse) => {
await gh.openPR({
branch,
sha: '42f90e2646c49a79bb2c98b658021d468ad5e814',
version,
updates: [cl]
});
const ref = await gh.refByBranchName(branch);
nbr.nockDone();
return ref;
});
ref.should.equal('refs/heads/release-7.0.0');
});

it('creates branch with updated content, if file in updates does not exist',
async () => {
const version = '8.0.0';
const branch = `release-${version}`;
const gh = new GitHub({
token: process.env.GH_TOKEN,
owner: 'bcoe',
repo: 'examples-conventional-commits'
});
const cl = new FakeFileUpdater({
path: 'CHANGELOG-FOO.md',
version,
changelogEntry: 'fixed all the things',
packageName: '@google-cloud/foo'
});
const ref = await nockBack('open-pr-create-file.json')
.then(async (nbr: NockBackResponse) => {
await gh.openPR({
branch,
sha: '42f90e2646c49a79bb2c98b658021d468ad5e814',
version,
updates: [cl]
});
const ref = await gh.refByBranchName(branch);
nbr.nockDone();
return ref;
});
ref.should.equal('refs/heads/release-8.0.0');
});
});
});
});
3 changes: 2 additions & 1 deletion test/updaters/changelog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ describe('ChangelogUpdater', () => {
it('inserts content at appropriate location if CHANGELOG exists',
async () => {
const oldContent =
readFileSync(resolve(fixturesPath, './CHANGELOG.md'), 'utf8');
readFileSync(resolve(fixturesPath, './CHANGELOG.md'), 'utf8')
.replace(/\r\n/g, '\n');
const changelog = new Changelog({
path: 'CHANGELOG.md',
changelogEntry: '## 2.0.0\n\n* added a new foo to bar.',
Expand Down