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-runtime-rust.git
The following commit(s) were added to refs/heads/master by this push:
new 3047f7b misc pre-release cleanups (#22)
3047f7b is described below
commit 3047f7b9f6678fef808875c2a36e40ae4584a335
Author: David Grove <[email protected]>
AuthorDate: Sun Feb 9 17:24:23 2020 -0500
misc pre-release cleanups (#22)
* misc pre-release cleanups
1. remove spurious execute mode bits
2. rename compile to compile.py to molify scancode
3. add initial CHANGELOG
* scancode fixes
---
.scalafmt.conf | 0
.scalafmt.conf => core/rust1.34/CHANGELOG.md | 12 ++++++------
core/rust1.34/Dockerfile | 4 ++--
core/rust1.34/Makefile | 2 +-
core/rust1.34/build.gradle | 0
core/rust1.34/{compile => compile.py} | 6 +++---
gradle/README.md | 0
gradle/docker.gradle | 0
gradle/wrapper/gradle-wrapper.properties | 0
settings.gradle | 0
tests/build.gradle | 0
.../runtime/actionContainers/ActionLoopRustBasicTests.scala | 0
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/.scalafmt.conf b/.scalafmt.conf
old mode 100755
new mode 100644
diff --git a/.scalafmt.conf b/core/rust1.34/CHANGELOG.md
old mode 100755
new mode 100644
similarity index 85%
copy from .scalafmt.conf
copy to core/rust1.34/CHANGELOG.md
index cc0159a..c945bc1
--- a/.scalafmt.conf
+++ b/core/rust1.34/CHANGELOG.md
@@ -1,3 +1,4 @@
+<!--
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -14,10 +15,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+-->
-style = intellij
-danglingParentheses = false
-maxColumn = 120
-docstrings = JavaDoc
-rewrite.rules = [SortImports]
-project.git = true
+# Rust OpenWhisk Runtime Container
+
+## 1.0.0
+ - Initial release
diff --git a/core/rust1.34/Dockerfile b/core/rust1.34/Dockerfile
index b523c9d..569f3f1 100644
--- a/core/rust1.34/Dockerfile
+++ b/core/rust1.34/Dockerfile
@@ -38,10 +38,10 @@ COPY --from=builder_release /bin/proxy /bin/proxy_release
RUN mv /bin/proxy_${GO_PROXY_BUILD_FROM} /bin/proxy
RUN mkdir -p /action
-ADD compile /bin/compile
+ADD compile.py /bin/compile.py
ADD src /usr/src
RUN cd /usr/src ; cargo build
ENV PYTHONIOENCODING=utf8
-ENV OW_COMPILER=/bin/compile
+ENV OW_COMPILER=/bin/compile.py
WORKDIR /action
ENTRYPOINT ["/bin/proxy"]
diff --git a/core/rust1.34/Makefile b/core/rust1.34/Makefile
index 3ff1fc7..6c1f8e0 100644
--- a/core/rust1.34/Makefile
+++ b/core/rust1.34/Makefile
@@ -25,7 +25,7 @@ build:
devel: build
docker run -ti -p 8080:8080 --entrypoint=bash \
- -v $(PWD):/mnt -e OW_COMPILER=/mnt/compile \
+ -v $(PWD):/mnt -e OW_COMPILER=/mnt/compile.py \
$(USER)/$(IMAGE)
push: build
diff --git a/core/rust1.34/build.gradle b/core/rust1.34/build.gradle
old mode 100755
new mode 100644
diff --git a/core/rust1.34/compile b/core/rust1.34/compile.py
similarity index 98%
rename from core/rust1.34/compile
rename to core/rust1.34/compile.py
index 88a05d7..b30bc4b 100755
--- a/core/rust1.34/compile
+++ b/core/rust1.34/compile.py
@@ -24,7 +24,7 @@ from os.path import abspath, exists, dirname
import time
import shutil
-## utils
+## utils
# write a file creating intermediate directories
def write_file(file, body):
os.makedirs(dirname(file), mode=0o755, exist_ok=True)
@@ -76,7 +76,7 @@ def build(tgt_dir):
sys.stdout.write(e)
else:
shutil.move(
- "/usr/src/target/%s/action_loop" % bin_dir,
+ "/usr/src/target/%s/action_loop" % bin_dir,
"%s/exec" % tgt_dir)
def sources(main, src_dir):
@@ -90,7 +90,7 @@ def sources(main, src_dir):
if exists(src_file):
os.makedirs("/usr/src/actions/src", mode=0o755, exist_ok=True)
copy_replace(src_file, "/usr/src/actions/src/lib.rs")
-
+
# add a cargo.toml if needed
cargo_action_file = "/usr/src/actions/Cargo.toml"
if not exists(cargo_action_file):
diff --git a/gradle/README.md b/gradle/README.md
old mode 100755
new mode 100644
diff --git a/gradle/docker.gradle b/gradle/docker.gradle
old mode 100755
new mode 100644
diff --git a/gradle/wrapper/gradle-wrapper.properties
b/gradle/wrapper/gradle-wrapper.properties
old mode 100755
new mode 100644
diff --git a/settings.gradle b/settings.gradle
old mode 100755
new mode 100644
diff --git a/tests/build.gradle b/tests/build.gradle
old mode 100755
new mode 100644
diff --git
a/tests/src/test/scala/runtime/actionContainers/ActionLoopRustBasicTests.scala
b/tests/src/test/scala/runtime/actionContainers/ActionLoopRustBasicTests.scala
old mode 100755
new mode 100644
