You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2017/11/10 13:05:20 UTC
[GitHub] csantanapr closed pull request #2933: Reorganization of the "core" folder to move folders associated with runtimes to "actionRuntimes" in root folder
csantanapr closed pull request #2933: Reorganization of the "core" folder to move folders associated with runtimes to "actionRuntimes" in root folder
URL: https://github.com/apache/incubator-openwhisk/pull/2933
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/core/actionProxy/Dockerfile b/actionRuntimes/actionProxy/Dockerfile
similarity index 100%
rename from core/actionProxy/Dockerfile
rename to actionRuntimes/actionProxy/Dockerfile
diff --git a/core/actionProxy/README.md b/actionRuntimes/actionProxy/README.md
similarity index 100%
rename from core/actionProxy/README.md
rename to actionRuntimes/actionProxy/README.md
diff --git a/core/actionProxy/build.gradle b/actionRuntimes/actionProxy/build.gradle
similarity index 100%
rename from core/actionProxy/build.gradle
rename to actionRuntimes/actionProxy/build.gradle
diff --git a/core/actionProxy/invoke.py b/actionRuntimes/actionProxy/invoke.py
similarity index 100%
rename from core/actionProxy/invoke.py
rename to actionRuntimes/actionProxy/invoke.py
diff --git a/core/javaAction/Dockerfile b/actionRuntimes/javaAction/Dockerfile
similarity index 100%
rename from core/javaAction/Dockerfile
rename to actionRuntimes/javaAction/Dockerfile
diff --git a/core/javaAction/build.gradle b/actionRuntimes/javaAction/build.gradle
similarity index 100%
rename from core/javaAction/build.gradle
rename to actionRuntimes/javaAction/build.gradle
diff --git a/core/javaAction/delete-build-run.sh b/actionRuntimes/javaAction/delete-build-run.sh
similarity index 100%
rename from core/javaAction/delete-build-run.sh
rename to actionRuntimes/javaAction/delete-build-run.sh
diff --git a/core/nodejs6Action/Dockerfile b/actionRuntimes/nodejs6Action/Dockerfile
similarity index 100%
rename from core/nodejs6Action/Dockerfile
rename to actionRuntimes/nodejs6Action/Dockerfile
diff --git a/core/nodejs6Action/build.gradle b/actionRuntimes/nodejs6Action/build.gradle
similarity index 100%
rename from core/nodejs6Action/build.gradle
rename to actionRuntimes/nodejs6Action/build.gradle
diff --git a/core/php7.1Action/Dockerfile b/actionRuntimes/php7.1Action/Dockerfile
similarity index 100%
rename from core/php7.1Action/Dockerfile
rename to actionRuntimes/php7.1Action/Dockerfile
diff --git a/core/php7.1Action/build.gradle b/actionRuntimes/php7.1Action/build.gradle
similarity index 100%
rename from core/php7.1Action/build.gradle
rename to actionRuntimes/php7.1Action/build.gradle
diff --git a/core/python2Action/Dockerfile b/actionRuntimes/python2Action/Dockerfile
similarity index 100%
rename from core/python2Action/Dockerfile
rename to actionRuntimes/python2Action/Dockerfile
diff --git a/core/python2Action/build.gradle b/actionRuntimes/python2Action/build.gradle
similarity index 100%
rename from core/python2Action/build.gradle
rename to actionRuntimes/python2Action/build.gradle
diff --git a/core/pythonAction/Dockerfile b/actionRuntimes/pythonAction/Dockerfile
similarity index 100%
rename from core/pythonAction/Dockerfile
rename to actionRuntimes/pythonAction/Dockerfile
diff --git a/core/pythonAction/build.gradle b/actionRuntimes/pythonAction/build.gradle
similarity index 100%
rename from core/pythonAction/build.gradle
rename to actionRuntimes/pythonAction/build.gradle
diff --git a/core/swift3.1.1Action/Dockerfile b/actionRuntimes/swift3.1.1Action/Dockerfile
similarity index 100%
rename from core/swift3.1.1Action/Dockerfile
rename to actionRuntimes/swift3.1.1Action/Dockerfile
diff --git a/core/swift3.1.1Action/build.gradle b/actionRuntimes/swift3.1.1Action/build.gradle
similarity index 100%
rename from core/swift3.1.1Action/build.gradle
rename to actionRuntimes/swift3.1.1Action/build.gradle
diff --git a/core/swift3Action/Dockerfile b/actionRuntimes/swift3Action/Dockerfile
similarity index 100%
rename from core/swift3Action/Dockerfile
rename to actionRuntimes/swift3Action/Dockerfile
diff --git a/core/swift3Action/build.gradle b/actionRuntimes/swift3Action/build.gradle
similarity index 100%
rename from core/swift3Action/build.gradle
rename to actionRuntimes/swift3Action/build.gradle
diff --git a/settings.gradle b/settings.gradle
index bd6b2671ad..3d652a435b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,14 +2,14 @@ include 'common:scala'
include 'core:controller'
include 'core:invoker'
-include 'core:nodejs6Action'
-include 'core:actionProxy'
-include 'core:pythonAction'
-include 'core:python2Action'
-include 'core:swift3Action'
-include 'core:swift3.1.1Action'
-include 'core:javaAction'
-include 'core:php7.1Action'
+include 'actionRuntimes:nodejs6Action'
+include 'actionRuntimes:actionProxy'
+include 'actionRuntimes:pythonAction'
+include 'actionRuntimes:python2Action'
+include 'actionRuntimes:swift3Action'
+include 'actionRuntimes:swift3.1.1Action'
+include 'actionRuntimes:javaAction'
+include 'actionRuntimes:php7.1Action'
include 'tools:cli'
diff --git a/tests/build.gradle b/tests/build.gradle
index ee415e3e1a..3492f1e95d 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -39,13 +39,13 @@ task testLeanCli(type: Test) {
// Add all images needed for local testing here
test.dependsOn([
- ':core:nodejs6Action:distDocker',
- ':core:actionProxy:distDocker',
- ':core:pythonAction:distDocker',
- ':core:python2Action:distDocker',
- ':core:javaAction:distDocker',
- ':core:swift3Action:distDocker',
- ':core:swift3.1.1Action:distDocker',
+ ':actionRuntimes:nodejs6Action:distDocker',
+ ':actionRuntimes:actionProxy:distDocker',
+ ':actionRuntimes:pythonAction:distDocker',
+ ':actionRuntimes:python2Action:distDocker',
+ ':actionRuntimes:javaAction:distDocker',
+ ':actionRuntimes:swift3Action:distDocker',
+ ':actionRuntimes:swift3.1.1Action:distDocker',
':sdk:docker:distDocker',
':tests:dat:blackbox:badaction:distDocker',
':tests:dat:blackbox:badproxy:distDocker'
diff --git a/tests/dat/blackbox/badaction/build.gradle b/tests/dat/blackbox/badaction/build.gradle
index 7a6387dc7a..b5921ba9aa 100644
--- a/tests/dat/blackbox/badaction/build.gradle
+++ b/tests/dat/blackbox/badaction/build.gradle
@@ -1,4 +1,4 @@
ext.dockerImageName = 'badaction'
apply from: '../../../../gradle/docker.gradle'
-distDocker.dependsOn ':core:actionProxy:distDocker'
+distDocker.dependsOn ':actionRuntimes:actionProxy:distDocker'
diff --git a/tests/dat/blackbox/badproxy/build.gradle b/tests/dat/blackbox/badproxy/build.gradle
index 61d18f3b82..6de5f5e307 100644
--- a/tests/dat/blackbox/badproxy/build.gradle
+++ b/tests/dat/blackbox/badproxy/build.gradle
@@ -1,4 +1,4 @@
ext.dockerImageName = 'badproxy'
apply from: '../../../../gradle/docker.gradle'
-distDocker.dependsOn ':core:actionProxy:distDocker'
+distDocker.dependsOn ':actionRuntimes:actionProxy:distDocker'
diff --git a/tools/build/redo b/tools/build/redo
index 3794751bb1..ef4e7dba69 100755
--- a/tools/build/redo
+++ b/tools/build/redo
@@ -272,42 +272,42 @@ Components = [
makeComponent('nodejs6action',
'build node.js v6 action container',
yaml = False,
- gradle = 'core:nodejs6Action'),
+ gradle = 'actionRuntimes:nodejs6Action'),
makeComponent('actionproxy',
'build action proxy container',
yaml = False,
- gradle = 'core:actionProxy'),
+ gradle = 'actionRuntimes:actionProxy'),
makeComponent('python2action',
'build python v2.7 action container',
yaml = False,
- gradle = 'core:python2Action'),
+ gradle = 'actionRuntimes:python2Action'),
makeComponent('python3action',
'build python action container',
yaml = False,
- gradle = 'core:pythonAction'),
+ gradle = 'actionRuntimes:pythonAction'),
makeComponent('swift3action',
'build swift v3 action container',
yaml = False,
- gradle = 'core:swift3Action'),
+ gradle = 'actionRuntimes:swift3Action'),
makeComponent('action-swift-v3.1.1',
'build swift v3.1.1 action container',
yaml = False,
- gradle = 'core:swift3.1.1Action'),
+ gradle = 'actionRuntimes:swift3.1.1Action'),
makeComponent('java8action',
'build java action container',
yaml = False,
- gradle = 'core:javaAction'),
+ gradle = 'actionRuntimes:javaAction'),
makeComponent('action-php-v7.1',
'build PHP v7.1 action container',
yaml = False,
- gradle = 'core:php7.1Action'),
+ gradle = 'actionRuntimes:php7.1Action'),
makeComponent('dockersdk',
'build docker action SDK (to deploy, use edge component)',
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index c629ef81e3..d8e4d64f6c 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -21,7 +21,7 @@ TERM=dumb ./gradlew checkScalafmtAll
cd $ROOTDIR/ansible
ANSIBLE_CMD="ansible-playbook -i environments/local -e docker_image_prefix=testing"
-GRADLE_PROJS_SKIP="-x :core:pythonAction:distDocker -x :core:python2Action:distDocker -x :core:swift3Action:distDocker -x core:swift3.1.1Action:distDocker -x :core:javaAction:distDocker"
+GRADLE_PROJS_SKIP="-x :actionRuntimes:pythonAction:distDocker -x :actionRuntimes:python2Action:distDocker -x :actionRuntimes:swift3Action:distDocker -x actionRuntimes:swift3.1.1Action:distDocker -x :actionRuntimes:javaAction:distDocker"
$ANSIBLE_CMD setup.yml
$ANSIBLE_CMD prereq.yml
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services