This is an automated email from the ASF dual-hosted git repository. msciabarra pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-go.git
The following commit(s) were added to refs/heads/master by this push: new dd0b580 de-incubation (#99) dd0b580 is described below commit dd0b580fe7ad991b229164f2803577841dfb6bec Author: Michele Sciabarra <30654959+sciabarra...@users.noreply.github.com> AuthorDate: Sun Aug 4 15:16:42 2019 +0200 de-incubation (#99) --- CHANGES.md | 3 +++ CONTRIBUTING.md | 2 +- DISCLAIMER.txt | 1 - README.md | 5 +---- actionloop/build.gradle | 2 +- examples/bash-hello/Makefile | 2 +- examples/golang-hello-single/Makefile | 2 +- examples/golang-hello-vendor/Makefile | 2 +- examples/golang-main-package/Makefile | 2 +- examples/golang-main-single/Makefile | 2 +- examples/golang-main-standalone/Makefile | 2 +- examples/golang-main-vendor/Makefile | 2 +- go.mod | 2 +- main/proxy.go | 2 +- .../runtime/actionContainers/ActionLoopBasicTests.scala | 2 +- .../actionContainers/ActionLoopContainerTests.scala | 2 +- tools/scancode/ASF-Release.cfg | 14 +++++++------- tools/travis/build.sh | 2 +- tools/travis/scan.sh | 2 +- tools/travis/setup.sh | 4 ++-- 20 files changed, 28 insertions(+), 29 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a2c8710..d52c7d9 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -36,3 +36,6 @@ ActionLoop for Scripting Languages - You can initalize multiple times when debugging - Removed gogradle plugin, now building directly with go +# Deincubation +- Removed the -incubation +- Now all runtimes use source release so no more actionloop-v2, renamed to actionloop-base diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0f7f858..8e1076e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -55,7 +55,7 @@ A good enhancement request comes with an explanation of what you are trying to d ### Discussion Please use the project's developer email list to engage our community: -[d...@openwhisk.incubator.apache.org](d...@openwhisk.incubator.apache.org) +[d...@openwhisk.apache.org](d...@openwhisk.apache.org) In addition, we provide a "dev" Slack team channel for conversations at: https://openwhisk-team.slack.com/messages/dev/ diff --git a/DISCLAIMER.txt b/DISCLAIMER.txt deleted file mode 100644 index f7a5c4e..0000000 --- a/DISCLAIMER.txt +++ /dev/null @@ -1 +0,0 @@ -Apache OpenWhisk Runtime Go is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate tha [...] diff --git a/README.md b/README.md index 88c634b..ada9041 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ --> # Apache OpenWhisk Runtimes for Go -[![Build Status](https://travis-ci.org/apache/incubator-openwhisk-runtime-go.svg?branch=master)](https://travis-ci.org/apache/incubator-openwhisk-runtime-go) +[![Build Status](https://travis-ci.org/apache/openwhisk-runtime-go.svg?branch=master)](https://travis-ci.org/apache/openwhisk-runtime-go) [![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0) [![Join Slack](https://img.shields.io/badge/join-slack-9B69A0.svg)](http://slack.openwhisk.org/) @@ -46,6 +46,3 @@ This repository containst both the OpenWhisk runtime for Golang Actions, as well # License [Apache 2.0](LICENSE.txt) -# Disclaimer - -Apache OpenWhisk Runtime Go is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate tha [...] diff --git a/actionloop/build.gradle b/actionloop/build.gradle index 5464137..27b1966 100644 --- a/actionloop/build.gradle +++ b/actionloop/build.gradle @@ -15,7 +15,7 @@ * limitations under the License. */ -ext.dockerImageName = 'actionloop-v2' +ext.dockerImageName = 'actionloop-base' apply from: '../gradle/docker.gradle' distDocker.dependsOn 'staticBuildProxy' diff --git a/examples/bash-hello/Makefile b/examples/bash-hello/Makefile index 29c12de..fe470ce 100644 --- a/examples/bash-hello/Makefile +++ b/examples/bash-hello/Makefile @@ -1,6 +1,6 @@ WSK?=wsk OW_USER?=openwhisk -OW_RUNTIME?=$(OW_USER)/actionloop-v2 +OW_RUNTIME?=$(OW_USER)/actionloop-base NAME=bash-hello PACKAGE=test SRC=hello.sh diff --git a/examples/golang-hello-single/Makefile b/examples/golang-hello-single/Makefile index c74fdba..0d43f92 100644 --- a/examples/golang-hello-single/Makefile +++ b/examples/golang-hello-single/Makefile @@ -1,5 +1,5 @@ OW_USER?=openwhisk -OW_RUNTIME?=$(OW_USER)/actionloop-v2 +OW_RUNTIME?=$(OW_USER)/actionloop-base OW_COMPILER?=$(OW_USER)/actionloop-golang-v1.11 WSK?=wsk MAIN=hello diff --git a/examples/golang-hello-vendor/Makefile b/examples/golang-hello-vendor/Makefile index 9d417fb..66aa089 100644 --- a/examples/golang-hello-vendor/Makefile +++ b/examples/golang-hello-vendor/Makefile @@ -1,5 +1,5 @@ OW_USER?=openwhisk -OW_RUNTIME?=$(OW_USER)/actionloop-v2 +OW_RUNTIME?=$(OW_USER)/actionloop-base OW_COMPILER?=$(OW_USER)/actionloop-golang-v1.11 WSK?=wsk MAIN=hello diff --git a/examples/golang-main-package/Makefile b/examples/golang-main-package/Makefile index d42a9df..59da7c2 100644 --- a/examples/golang-main-package/Makefile +++ b/examples/golang-main-package/Makefile @@ -1,5 +1,5 @@ OW_USER?=openwhisk -OW_RUNTIME?=$(OW_USER)/actionloop-v2 +OW_RUNTIME?=$(OW_USER)/actionloop-base OW_COMPILER?=$(OW_USER)/actionloop-golang-v1.11 WSK?=wsk MAIN=main diff --git a/examples/golang-main-single/Makefile b/examples/golang-main-single/Makefile index e861905..5296b8d 100644 --- a/examples/golang-main-single/Makefile +++ b/examples/golang-main-single/Makefile @@ -1,5 +1,5 @@ OW_USER?=openwhisk -OW_RUNTIME?=$(OW_USER)/actionloop-v2 +OW_RUNTIME?=$(OW_USER)/actionloop-base OW_COMPILER?=$(OW_USER)/actionloop-golang-v1.11 WSK?=wsk MAIN=main diff --git a/examples/golang-main-standalone/Makefile b/examples/golang-main-standalone/Makefile index 4918436..e6ddcd7 100644 --- a/examples/golang-main-standalone/Makefile +++ b/examples/golang-main-standalone/Makefile @@ -1,5 +1,5 @@ OW_USER?=openwhisk -OW_RUNTIME?=$(OW_USER)/actionloop-v2 +OW_RUNTIME?=$(OW_USER)/actionloop-base OW_COMPILER?=$(OW_USER)/actionloop-golang-v1.11 WSK?=wsk MAIN=main diff --git a/examples/golang-main-vendor/Makefile b/examples/golang-main-vendor/Makefile index bca6b37..1c3d7ce 100644 --- a/examples/golang-main-vendor/Makefile +++ b/examples/golang-main-vendor/Makefile @@ -1,5 +1,5 @@ OW_USER?=openwhisk -OW_RUNTIME?=$(OW_USER)/actionloop-v2 +OW_RUNTIME?=$(OW_USER)/actionloop-base OW_COMPILER?=$(OW_USER)/actionloop-golang-v1.11 WSK?=wsk MAIN=main diff --git a/go.mod b/go.mod index 1cd20fd..44da655 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/apache/incubator-openwhisk-runtime-go +module github.com/apache/openwhisk-runtime-go go 1.12 diff --git a/main/proxy.go b/main/proxy.go index 7f35914..9674724 100644 --- a/main/proxy.go +++ b/main/proxy.go @@ -22,7 +22,7 @@ import ( "log" "os" - "github.com/apache/incubator-openwhisk-runtime-go/openwhisk" + "github.com/apache/openwhisk-runtime-go/openwhisk" ) // flag to show version diff --git a/tests/src/test/scala/runtime/actionContainers/ActionLoopBasicTests.scala b/tests/src/test/scala/runtime/actionContainers/ActionLoopBasicTests.scala index 1a346ce..fe1f3aa 100644 --- a/tests/src/test/scala/runtime/actionContainers/ActionLoopBasicTests.scala +++ b/tests/src/test/scala/runtime/actionContainers/ActionLoopBasicTests.scala @@ -25,7 +25,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) class ActionLoopBasicTests extends BasicActionRunnerTests with WskActorSystem { - val image = "actionloop-v2" + val image = "actionloop-base" override def withActionContainer(env: Map[String, String] = Map.empty)( code: ActionContainer => Unit) = { diff --git a/tests/src/test/scala/runtime/actionContainers/ActionLoopContainerTests.scala b/tests/src/test/scala/runtime/actionContainers/ActionLoopContainerTests.scala index 59ff555..86f69e4 100644 --- a/tests/src/test/scala/runtime/actionContainers/ActionLoopContainerTests.scala +++ b/tests/src/test/scala/runtime/actionContainers/ActionLoopContainerTests.scala @@ -32,7 +32,7 @@ class ActionLoopContainerTests import GoResourceHelpers._ - val image = "actionloop-v2" + val image = "actionloop-base" def withActionLoopContainer(code: ActionContainer => Unit) = withContainer(image)(code) diff --git a/tools/scancode/ASF-Release.cfg b/tools/scancode/ASF-Release.cfg index 4263ea7..0d81052 100644 --- a/tools/scancode/ASF-Release.cfg +++ b/tools/scancode/ASF-Release.cfg @@ -65,19 +65,19 @@ vendor .gradle/ # Exclude performance test files (no significant content) -incubator-openwhisk/tests/performance/wrk_tests -incubator-openwhisk/tests/dat/actions -incubator-openwhisk/docs/images -incubator-openwhisk/bin +openwhisk/tests/performance/wrk_tests +openwhisk/tests/dat/actions +openwhisk/docs/images +openwhisk/bin -# incubator-openwhisk-client-go, incubator-openwhisk-wskdeploy autogenerated Go files +# openwhisk-client-go, openwhisk-wskdeploy autogenerated Go files # NOTE: we SHOULD make this more granular, there are many .go files that can have # ASF license headers -incubator-openwhisk-wskdeploy/specification/images +openwhisk-wskdeploy/specification/images wski18n # Exclude scancode tests that test for bad license headers -incubator-openwhisk-utilities/scancode/tests/exclude +openwhisk-utilities/scancode/tests/exclude [Options] # Not all code files allow licenses to appear starting at the first character diff --git a/tools/travis/build.sh b/tools/travis/build.sh index 3952414..c03aa9f 100755 --- a/tools/travis/build.sh +++ b/tools/travis/build.sh @@ -23,7 +23,7 @@ set -ex SCRIPTDIR=$(cd $(dirname "$0") && pwd) ROOTDIR="$SCRIPTDIR/../.." WHISKDIR="$ROOTDIR/../openwhisk" -UTILDIR="$ROOTDIR/../incubator-openwhisk-utilities" +UTILDIR="$ROOTDIR/../openwhisk-utilities" export OPENWHISK_HOME=$WHISKDIR diff --git a/tools/travis/scan.sh b/tools/travis/scan.sh index ac00de9..96bd9e8 100755 --- a/tools/travis/scan.sh +++ b/tools/travis/scan.sh @@ -22,7 +22,7 @@ set -ex SCRIPTDIR=$(cd $(dirname "$0") && pwd) ROOTDIR="$SCRIPTDIR/../.." -UTILDIR="$ROOTDIR/../incubator-openwhisk-utilities" +UTILDIR="$ROOTDIR/../openwhisk-utilities" # run scancode using the ASF Release configuration pushd $UTILDIR diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh index 18b5049..7e1d1d1 100755 --- a/tools/travis/setup.sh +++ b/tools/travis/setup.sh @@ -32,10 +32,10 @@ HOMEDIR="$SCRIPTDIR/../../../" # clone OpenWhisk utilities repo. in order to run scanCode cd $HOMEDIR -git clone https://github.com/apache/incubator-openwhisk-utilities.git +git clone https://github.com/apache/openwhisk-utilities.git # clone main openwhisk repo. for testing purposes -git clone --depth=1 https://github.com/apache/incubator-openwhisk.git openwhisk +git clone --depth=1 https://github.com/apache/openwhisk.git openwhisk cd openwhisk ./tools/travis/setup.sh go get github.com/sirupsen/logrus