openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rab...@apache.org
Subject [openwhisk.wiki] branch master updated: Remove incubator.
Date Sun, 25 Aug 2019 00:07:36 GMT
This is an automated email from the ASF dual-hosted git repository.

rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk.wiki.git


The following commit(s) were added to refs/heads/master by this push:
     new e46c9f1  Remove incubator.
e46c9f1 is described below

commit e46c9f17726a4d6f83030b7feb9a3ca304ebd7b7
Author: rodric rabbah <rodric@gmail.com>
AuthorDate: Sat Aug 24 20:07:34 2019 -0400

    Remove incubator.
---
 Contributing:-Git-guidelines.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Contributing:-Git-guidelines.md b/Contributing:-Git-guidelines.md
index bfb82c5..00f99c6 100644
--- a/Contributing:-Git-guidelines.md
+++ b/Contributing:-Git-guidelines.md
@@ -22,13 +22,13 @@ To make sure this never happens to you, you can run the same tests on
your local
 
 1. Clone the OpenWhisk utilities project repo.:
 ```bash
-$ git clone https://github.com/apache/incubator-openwhisk-utilities.git
+$ git clone https://github.com/apache/openwhisk-utilities.git
 ```
 
 2. Run the scancode utility against the root directory of your project or subdirectory where
your code changes live:
 ```bash
 # Invoke Python utility (works with either Python 2 or 3)
-$ python ./incubator-openwhisk-utilities/scancode/scanCode.py $ROOTDIR
+$ python ./openwhisk-utilities/scancode/scanCode.py $ROOTDIR
 ```
 
 It is worth adding a Git [pre-commit hook](https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks)
to automatically run the checks before you can even type in a Git commit message. Here is
a sample `pre-commit` file:
@@ -39,7 +39,7 @@ $ cat /path/to/openwhisk/.git/hooks/pre-commit
 
 # determine openwhisk base directory
 root="$(git rev-parse --show-toplevel)"
-python /path/to/incubator-openwhisk-utilities/scancode/scanCode.py . --config $root/tools/
+python /path/to/openwhisk-utilities/scancode/scanCode.py . --config $root/tools/
 ```
 
 _Note_: A hook a locally installed, so if you check out the repository again, you will need
to reinstall it.
@@ -47,19 +47,19 @@ _Note_: A hook a locally installed, so if you check out the repository
again, yo
 3. If your project repo. is new or does not run scancode yet, you can choose to create a
"pre-build" Bash script that can be included in your Travis CI integration that includes code
similar to Step 1 and 2.  You can invoke this script within the ".travis.yml" file early in
your _install_ or _build_ scripts.
 
 For full documentation on the scancode utility, please reference its README:
-[https://github.com/apache/incubator-openwhisk-utilities/tree/master/scancode](https://github.com/apache/incubator-openwhisk-utilities/tree/master/scancode)
+[https://github.com/apache/openwhisk-utilities/tree/master/scancode](https://github.com/apache/openwhisk-utilities/tree/master/scancode)
 
 ### Scala
 
-Scala is formatted using [scalafmt](http://scalameta.org/scalafmt/). Its configuration can
be found in [.scalafmt.conf](https://github.com/apache/incubator-openwhisk/tree/master/.scalafmt.conf).
To automatically reformat changed Scala files upon commit, you can use
-the `git pre-commit` hook scripts in [tools/git](https://github.com/apache/incubator-openwhisk/tree/master/tools/git).
Follow the instructions
-in the [README](https://github.com/apache/incubator-openwhisk/blob/master/tools/git/README.md).
+Scala is formatted using [scalafmt](http://scalameta.org/scalafmt/). Its configuration can
be found in [.scalafmt.conf](https://github.com/apache/openwhisk/tree/master/.scalafmt.conf).
To automatically reformat changed Scala files upon commit, you can use
+the `git pre-commit` hook scripts in [tools/git](https://github.com/apache/openwhisk/tree/master/tools/git).
Follow the instructions
+in the [README](https://github.com/apache/openwhisk/blob/master/tools/git/README.md).
 
 For example, add the following to your `git pre-commit` hook:
 
 ```
 # -- Code formatting --
-/path/to/incubator-openwhisk/tools/git/pre-commit-scalafmt-native.sh
+/path/to/openwhisk/tools/git/pre-commit-scalafmt-native.sh
 ```
 
 ## Work with forks
@@ -68,15 +68,15 @@ For example, add the following to your `git pre-commit` hook:
 
 The instructions assume that the merger has set up a git remote with the name `upstream`
to the root repository. We show next how to achieve this for the openwhisk Open Source repository.
Concretely, you achieve this as follows:
 
-  1. In GitHub, fork `apache/incubator-openwhisk` to `yourname/incubator-openwhisk`.
+  1. In GitHub, fork `apache/openwhisk` to `yourname/openwhisk`.
 
   2. Checkout your fork:
 
-    git clone git@github.com:yourname/incubator-openwhisk
+    git clone git@github.com:yourname/openwhisk
 
   3. Add upstream remote:
 
-    git remote add upstream git@github.com:apache/incubator-openwhisk
+    git remote add upstream git@github.com:apache/openwhisk
     git fetch --all
 
 After this setup, your local `master`, should point to the same commit as `origin/master`
and `upstream/master`. You can confirm that by running, e.g., `git log -1 --decorate` (FWIW,
for log inspection, I personally recommend using [`tig`](https://github.com/jonas/tig)).


Mime
View raw message