You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by dg...@apache.org on 2019/08/21 14:39:55 UTC
[openwhisk-runtime-swift] branch master updated: tlp: remove
incubator references and disclaimer (#103)
This is an automated email from the ASF dual-hosted git repository.
dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-swift.git
The following commit(s) were added to refs/heads/master by this push:
new b4fc5c7 tlp: remove incubator references and disclaimer (#103)
b4fc5c7 is described below
commit b4fc5c781790c37e401522135347d4311e2ff473
Author: David Grove <dg...@users.noreply.github.com>
AuthorDate: Wed Aug 21 10:39:50 2019 -0400
tlp: remove incubator references and disclaimer (#103)
---
.github/ISSUE_TEMPLATE.md | 2 +-
.travis.yml | 4 ++--
CONTRIBUTING.md | 2 +-
DISCLAIMER.txt | 1 -
README.md | 8 ++------
core/swift3.1.1Action/Dockerfile | 2 +-
core/swift41Action/Dockerfile | 2 +-
.../runtime/actionContainers/Swift311ActionContainerTests.scala | 2 +-
tools/travis/build.sh | 2 +-
tools/travis/setup.sh | 4 ++--
10 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 8ff1432..049789d 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -14,7 +14,7 @@ information shown below.
If you are reporting an enhancement request, please include information on what you are trying to achieve and why that enhancement would help you.
For more information about reporting issues, see
-https://github.com/apache/incubator-openwhisk/blob/master/CONTRIBUTING.md#raising-issues
+https://github.com/apache/openwhisk/blob/master/CONTRIBUTING.md#raising-issues
Use the commands below to provide key information from your environment:
You do not have to include this information if this is a feature request.
diff --git a/.travis.yml b/.travis.yml
index 320c0f6..94c93f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,12 +41,12 @@ deploy:
on:
tags: true
all_branches: true
- repo: apache/incubator-openwhisk-runtime-swift
+ repo: apache/openwhisk-runtime-swift
- provider: script
script: "./tools/travis/publish.sh openwhisk 4.1 nightly && ./tools/travis/publish.sh openwhisk 4.2 nightly"
on:
branch: master
- repo: apache/incubator-openwhisk-runtime-swift
+ repo: apache/openwhisk-runtime-swift
env:
global:
- secure: YqQG7kchpqrqYNCBHmoXs5QJFJQmtuy30WYQnQtudVuqZ1/PqsTJXy6+kNxQ88z5NoU4XZKClB61V8ZVHqGsbQd3lAsTy11QKxf+s4kfsGBuoRlow4eQmnUnnaF3E6KVV2nJ4oXro7RQhP3WwLjpsThrMk322B1ZtlSRALR9hK5wCit8Q1ifSJqmKLwuoNSNQzd7onlDF19Q9pyKkgVu9wLKU5epo76wuFkRfkbr1mB3fF2le2WRNXer2N8rL8McHousFPYA03IIdo6zdX27yGmqSW3teCiVYieGrqtaGhH0WCE7dcmoQ/gs7IBqn1K80wJSR1lbkKDiWzmb73FWScKuXmRn5c4HCq/wPya2I5JNUGyPg5YI0HyMDxGTJ/OdXv2Aizyh3hyNMFjtbjK4N6gz6kFAn8Uo6wFs441Bq+S3+ipLAQ41KIQ7E4/Di6ERSG8KKWKy+LlnA5Qy60CQHRIyJCg3+aqf [...]
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3c0595b..d8f8faa 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -57,7 +57,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:
-[dev@openwhisk.incubator.apache.org](dev@openwhisk.incubator.apache.org)
+[dev@openwhisk.apache.org](dev@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 18e1789..0000000
--- a/DISCLAIMER.txt
+++ /dev/null
@@ -1 +0,0 @@
-Apache OpenWhisk Runtime Swift 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 [...]
diff --git a/README.md b/README.md
index 4f3cefd..ea58e5a 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@
# Apache OpenWhisk runtimes for swift
[](http://www.apache.org/licenses/LICENSE-2.0)
-[](https://travis-ci.org/apache/incubator-openwhisk-runtime-swift)
+[](https://travis-ci.org/apache/openwhisk-runtime-swift)
## Changelogs
@@ -250,7 +250,7 @@ actions/Hello/Sources/main.swift
Change to the parent directory then run the compile script specify the project directory, the kind `swift:3.1.1` or `swift:4.2` and any swiftc build flags like the following:
```
cd actions/
-incubator-runtime-swift/tools/build/compile.sh Hello swift:4.2 -v
+runtime-swift/tools/build/compile.sh Hello swift:4.2 -v
```
This will produce a zip `build/swift4/Hello.zip`
@@ -427,7 +427,3 @@ Then create the action using your the image from dockerhub
wsk action update myAction myAction.swift --docker $user_prefix/action-swift-v4.2
```
The `$user_prefix` is usually your dockerhub user id.
-
-# Disclaimer
-
-Apache OpenWhisk Runtime Swift 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 [...]
diff --git a/core/swift3.1.1Action/Dockerfile b/core/swift3.1.1Action/Dockerfile
index dd0129f..d10e086 100644
--- a/core/swift3.1.1Action/Dockerfile
+++ b/core/swift3.1.1Action/Dockerfile
@@ -27,7 +27,7 @@ RUN apt-get -y update \
&& apt-get -y install --fix-missing python2.7 python-gevent python-flask zip
# Add the action proxy
-ADD https://raw.githubusercontent.com/apache/incubator-openwhisk-runtime-docker/dockerskeleton%401.3.3/core/actionProxy/actionproxy.py /actionProxy/actionproxy.py
+ADD https://raw.githubusercontent.com/apache/openwhisk-runtime-docker/dockerskeleton%401.3.3/core/actionProxy/actionproxy.py /actionProxy/actionproxy.py
# Add files needed to build and run action
RUN mkdir -p /swift3Action
diff --git a/core/swift41Action/Dockerfile b/core/swift41Action/Dockerfile
index 03ea8e2..6fdb468 100644
--- a/core/swift41Action/Dockerfile
+++ b/core/swift41Action/Dockerfile
@@ -23,7 +23,7 @@ RUN apt-get -y update \
&& apt-get -y install --fix-missing python2.7 python-gevent python-flask zip
# Add the action proxy
-ADD https://raw.githubusercontent.com/apache/incubator-openwhisk-runtime-docker/dockerskeleton%401.3.3/core/actionProxy/actionproxy.py /actionProxy/actionproxy.py
+ADD https://raw.githubusercontent.com/apache/openwhisk-runtime-docker/dockerskeleton%401.3.3/core/actionProxy/actionproxy.py /actionProxy/actionproxy.py
# Add files needed to build and run action
RUN mkdir -p /swift4Action/spm-build/Sources/Action
diff --git a/tests/src/test/scala/runtime/actionContainers/Swift311ActionContainerTests.scala b/tests/src/test/scala/runtime/actionContainers/Swift311ActionContainerTests.scala
index d23d383..dd26b96 100644
--- a/tests/src/test/scala/runtime/actionContainers/Swift311ActionContainerTests.scala
+++ b/tests/src/test/scala/runtime/actionContainers/Swift311ActionContainerTests.scala
@@ -27,7 +27,7 @@ class Swift311ActionContainerTests extends SwiftActionContainerTests {
override lazy val swiftContainerImageName = "action-swift-v3.1.1"
override lazy val swiftBinaryName = "tests/dat/build/swift311/HelloSwift3.zip"
- // issue https://github.com/apache/incubator-openwhisk-runtime-swift/issues/74
+ // issue https://github.com/apache/openwhisk-runtime-swift/issues/74
override val testLargeInput = TestConfig("", skipTest = true)
lazy val watsonCode = """
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index 8458314..ac99de8 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/setup.sh b/tools/travis/setup.sh
index 3424cdb..6315f1a 100755
--- a/tools/travis/setup.sh
+++ b/tools/travis/setup.sh
@@ -26,9 +26,9 @@ 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