Skip to content

Delete grpc-native-core from master, along with all references #1425

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

Merged
merged 4 commits into from
May 14, 2020
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ yarn.lock
\#*\#
.\#*

packages/grpc-native-core/src/node/

.nyc_output/
reports/

Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "packages/grpc-native-core/deps/grpc"]
path = packages/grpc-native-core/deps/grpc
url = https://github.com/grpc/grpc.git
[submodule "packages/grpc-tools/deps/protobuf"]
path = packages/grpc-tools/deps/protobuf
url = https://github.com/protocolbuffers/protobuf
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ For a comparison of the features available in these two libraries, see [this doc

### C-based Client and Server

Directory: [`packages/grpc-native-core`](https://github.com/grpc/grpc-node/tree/master/packages/grpc-native-core) (see here for installation information)
Directory: [`packages/grpc-native-core`](https://github.com/grpc/grpc-node/tree/[email protected]/packages/grpc-native-core) (lives in the `[email protected]` branch) (see here for installation information)

npm package: [grpc](https://www.npmjs.com/package/grpc).

Expand Down
31 changes: 8 additions & 23 deletions gulpfile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,55 +18,40 @@
import * as gulp from 'gulp';
import * as healthCheck from './packages/grpc-health-check/gulpfile';
import * as jsCore from './packages/grpc-js/gulpfile';
import * as nativeCore from './packages/grpc-native-core/gulpfile';
import * as protobuf from './packages/proto-loader/gulpfile';
import * as internalTest from './test/gulpfile';

const root = __dirname;
const installAll = gulp.series(jsCore.install, healthCheck.install, protobuf.install, internalTest.install);

const installAll = gulp.series(jsCore.install, nativeCore.install, healthCheck.install, protobuf.install, internalTest.install);
const lint = gulp.parallel(jsCore.lint);

const installAllWindows = gulp.series(jsCore.install, nativeCore.installWindows, healthCheck.install, protobuf.install, internalTest.install);
const build = gulp.series(jsCore.compile, protobuf.compile);

const lint = gulp.parallel(jsCore.lint, nativeCore.lint);

const build = gulp.series(jsCore.compile, nativeCore.build, protobuf.compile);

const link = gulp.series(healthCheck.linkAdd);

const setup = gulp.series(installAll, link);

const setupWindows = gulp.series(installAllWindows, link);
const setup = gulp.series(installAll);

const setupPureJSInterop = gulp.series(jsCore.install, protobuf.install, internalTest.install);

const clean = gulp.series(jsCore.clean, nativeCore.clean, protobuf.clean);
const clean = gulp.series(jsCore.clean, protobuf.clean);

const cleanAll = gulp.series(jsCore.cleanAll, nativeCore.cleanAll, healthCheck.cleanAll, internalTest.cleanAll, protobuf.cleanAll);
const cleanAll = gulp.series(jsCore.cleanAll, internalTest.cleanAll, protobuf.cleanAll);

const nativeTestOnly = gulp.parallel(nativeCore.test, healthCheck.test);
const nativeTestOnly = gulp.parallel(healthCheck.test);

const nativeTest = gulp.series(build, nativeTestOnly);

const testOnly = gulp.parallel(jsCore.test, nativeTestOnly, protobuf.test);

const test = gulp.series(build, testOnly, internalTest.test);

const docGen = gulp.series(nativeCore.docGen);

export {
installAll,
installAllWindows,
lint,
build,
link,
setup,
setupWindows,
setupPureJSInterop,
clean,
cleanAll,
nativeTestOnly,
nativeTest,
test,
docGen
test
};
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,13 @@
"include": [
"packages/grpc-health-check/health.js",
"packages/grpc-js/build/src/*",
"packages/grpc-native-core/index.js",
"packages/grpc-native-core/src/*.js",
"packages/proto-loader/build/src/*"
],
"cache": true,
"all": true
},
"scripts": {
"test": "nyc gulp test && GRPC_DNS_RESOLVER=ares nyc gulp nativeTestOnly",
"test": "nyc gulp test",
"coverage": "nyc report --reporter=text-lcov | coveralls"
}
}
14 changes: 2 additions & 12 deletions packages/grpc-health-check/gulpfile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,15 @@ const healthCheckDir = __dirname;
const baseDir = path.resolve(healthCheckDir, '..', '..');
const testDir = path.resolve(healthCheckDir, 'test');

const cleanLinks = () => del(path.resolve(healthCheckDir, 'node_modules/grpc'));

const cleanAll = gulp.parallel(cleanLinks);

const runInstall = () => execa('npm', ['install', '--unsafe-perm'], {cwd: healthCheckDir, stdio: 'inherit'});

const install = gulp.series(cleanLinks, runInstall);
const runRebuild = () => execa('npm', ['rebuild', '--unsafe-perm'], {cwd: healthCheckDir, stdio: 'inherit'});

const linkAdd = (callback) => {
linkSync(healthCheckDir, './node_modules/grpc', '../grpc-native-core');
callback();
}
const install = gulp.series(runInstall, runRebuild);

const test = () => gulp.src(`${testDir}/*.js`).pipe(mocha({reporter: 'mocha-jenkins-reporter'}));

export {
cleanLinks,
cleanAll,
install,
linkAdd,
test
}
1 change: 0 additions & 1 deletion packages/grpc-native-core/.jshintignore

This file was deleted.

1 change: 0 additions & 1 deletion packages/grpc-native-core/.npmignore

This file was deleted.

201 changes: 0 additions & 201 deletions packages/grpc-native-core/LICENSE

This file was deleted.

Loading