Skip to content

Commit 3047f7b

Browse files
authored
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
1 parent b43cf42 commit 3047f7b

File tree

12 files changed

+29
-6
lines changed

12 files changed

+29
-6
lines changed

.scalafmt.conf

100755100644
File mode changed.

core/rust1.34/CHANGELOG.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<!--
2+
#
3+
# Licensed to the Apache Software Foundation (ASF) under one or more
4+
# contributor license agreements. See the NOTICE file distributed with
5+
# this work for additional information regarding copyright ownership.
6+
# The ASF licenses this file to You under the Apache License, Version 2.0
7+
# (the "License"); you may not use this file except in compliance with
8+
# the License. You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
-->
19+
20+
# Rust OpenWhisk Runtime Container
21+
22+
## 1.0.0
23+
- Initial release

core/rust1.34/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ COPY --from=builder_release /bin/proxy /bin/proxy_release
3838
RUN mv /bin/proxy_${GO_PROXY_BUILD_FROM} /bin/proxy
3939

4040
RUN mkdir -p /action
41-
ADD compile /bin/compile
41+
ADD compile.py /bin/compile.py
4242
ADD src /usr/src
4343
RUN cd /usr/src ; cargo build
4444
ENV PYTHONIOENCODING=utf8
45-
ENV OW_COMPILER=/bin/compile
45+
ENV OW_COMPILER=/bin/compile.py
4646
WORKDIR /action
4747
ENTRYPOINT ["/bin/proxy"]

core/rust1.34/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ build:
2525

2626
devel: build
2727
docker run -ti -p 8080:8080 --entrypoint=bash \
28-
-v $(PWD):/mnt -e OW_COMPILER=/mnt/compile \
28+
-v $(PWD):/mnt -e OW_COMPILER=/mnt/compile.py \
2929
$(USER)/$(IMAGE)
3030

3131
push: build

core/rust1.34/build.gradle

100755100644
File mode changed.

core/rust1.34/compile renamed to core/rust1.34/compile.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import time
2525
import shutil
2626

27-
## utils
27+
## utils
2828
# write a file creating intermediate directories
2929
def write_file(file, body):
3030
os.makedirs(dirname(file), mode=0o755, exist_ok=True)
@@ -76,7 +76,7 @@ def build(tgt_dir):
7676
sys.stdout.write(e)
7777
else:
7878
shutil.move(
79-
"/usr/src/target/%s/action_loop" % bin_dir,
79+
"/usr/src/target/%s/action_loop" % bin_dir,
8080
"%s/exec" % tgt_dir)
8181

8282
def sources(main, src_dir):
@@ -90,7 +90,7 @@ def sources(main, src_dir):
9090
if exists(src_file):
9191
os.makedirs("/usr/src/actions/src", mode=0o755, exist_ok=True)
9292
copy_replace(src_file, "/usr/src/actions/src/lib.rs")
93-
93+
9494
# add a cargo.toml if needed
9595
cargo_action_file = "/usr/src/actions/Cargo.toml"
9696
if not exists(cargo_action_file):

gradle/README.md

100755100644
File mode changed.

gradle/docker.gradle

100755100644
File mode changed.

gradle/wrapper/gradle-wrapper.properties

100755100644
File mode changed.

settings.gradle

100755100644
File mode changed.

tests/build.gradle

100755100644
File mode changed.

tests/src/test/scala/runtime/actionContainers/ActionLoopRustBasicTests.scala

100755100644
File mode changed.

0 commit comments

Comments
 (0)