Skip to content

Commit ca0ea31

Browse files
committed
Stopped using environment variable VELA
1 parent c730565 commit ca0ea31

5 files changed

Lines changed: 34 additions & 29 deletions

File tree

.circleci/config.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@ version: 2.1
1616
jobs:
1717
groovy_script_to_jar:
1818
docker:
19-
- image: devatherock/vela-groovy-script-to-jar:0.6.0
19+
- image: devatherock/vela-groovy-script-to-jar:0.6.2
2020
<<: *resource_class
2121
<<: *work_directory
2222
environment:
23-
VELA: true
2423
PARAMETER_SCRIPT_PATH: CreateNativeImage.groovy
2524
steps:
2625
- checkout
@@ -39,7 +38,7 @@ jobs:
3938
- attach_workspace:
4039
at: ~/java-to-native
4140
- run: |
42-
TAG=0.1.1
41+
TAG=0.1.2
4342
docker build -t devatherock/java-to-native:$TAG .
4443
docker tag devatherock/java-to-native:$TAG devatherock/java-to-native:latest
4544
docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## [0.1.2] - 2020-06-21
4+
### Changed
5+
- Stopped using environment variable `VELA`
6+
37
## [0.1.1] - 2020-06-20
48
### Added
59
- `--static` and `--no-fallback` options as default

DOCS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The following parameters can be set to configure the plugin.
1313
```yaml
1414
java_to_native:
1515
docker:
16-
- image: devatherock/java-to-native:0.1.1
16+
- image: devatherock/java-to-native:0.1.2
1717
working_directory: ~/drone-yaml-validator
1818
environment:
1919
PLUGIN_JAR_NAME: build/native/libs/YamlValidator.jar
@@ -37,7 +37,7 @@ steps:
3737
ruleset:
3838
branch: master
3939
event: push
40-
image: devatherock/java-to-native:0.1.1
40+
image: devatherock/java-to-native:0.1.2
4141
parameters:
4242
jar_name: build/native/libs/YamlValidator.jar
4343
config_file: config/graal.yml

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Execute from the working directory:
1515
docker run --rm \
1616
-e PLUGIN_JAR_NAME=YamlValidator.jar \
1717
-e PLUGIN_CONFIG_FILE=config/graal.yml \
18-
devatherock/java-to-native:0.1.0
18+
devatherock/java-to-native:0.1.2
1919
```
2020

2121
## Configuration
@@ -28,8 +28,6 @@ native-image:
2828
build:
2929
# Additional arguments to pass to the native image build
3030
additional-args:
31-
- "--static"
32-
- "--no-fallback"
3331
- "-H:IncludeResourceBundles=net.sourceforge.argparse4j.internal.ArgumentParserImpl"
3432
# If specified, only these arguments will be passed to the image build
3533
#override-args:

entry-point.sh

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,38 @@ if [ "$PLUGIN_DEBUG" = "true" ] || [ "$PARAMETER_DEBUG" = "true" ]; then
33
ENABLE_DEBUG=true
44
fi
55

6-
MAIN_CLASS=$PLUGIN_MAIN_CLASS
7-
JAR_NAME=$PLUGIN_JAR_NAME
8-
CONFIG_FILE=$PLUGIN_CONFIG_FILE
9-
CLASSPATH=$PLUGIN_CLASSPATH
10-
REFLECTION_PATH=$PLUGIN_REFLECTION_PATH
116

12-
if [ "$VELA" = "true" ]; then
13-
if [ ! -z "$PARAMETER_MAIN_CLASS" ]; then
14-
MAIN_CLASS=$PARAMETER_MAIN_CLASS
15-
fi
7+
if [ ! -z "$PLUGIN_MAIN_CLASS" ]; then
8+
MAIN_CLASS=$PLUGIN_MAIN_CLASS
9+
elif [ ! -z "$PARAMETER_MAIN_CLASS" ]; then
10+
MAIN_CLASS=$PARAMETER_MAIN_CLASS
11+
fi
1612

17-
if [ ! -z "$PARAMETER_JAR_NAME" ]; then
18-
JAR_NAME=$PARAMETER_JAR_NAME
19-
fi
13+
if [ ! -z "$PLUGIN_JAR_NAME" ]; then
14+
JAR_NAME=$PLUGIN_JAR_NAME
15+
elif [ ! -z "$PARAMETER_JAR_NAME" ]; then
16+
JAR_NAME=$PARAMETER_JAR_NAME
17+
fi
2018

21-
if [ ! -z "$PARAMETER_CONFIG_FILE" ]; then
22-
CONFIG_FILE=$PARAMETER_CONFIG_FILE
23-
fi
19+
if [ ! -z "$PLUGIN_CONFIG_FILE" ]; then
20+
CONFIG_FILE=$PLUGIN_CONFIG_FILE
21+
elif [ ! -z "$PARAMETER_CONFIG_FILE" ]; then
22+
CONFIG_FILE=$PARAMETER_CONFIG_FILE
23+
fi
2424

25-
if [ ! -z "$PARAMETER_CLASSPATH" ]; then
26-
CLASSPATH=$PARAMETER_CLASSPATH
27-
fi
25+
if [ ! -z "$PLUGIN_CLASSPATH" ]; then
26+
CLASSPATH=$PLUGIN_CLASSPATH
27+
elif [ ! -z "$PARAMETER_CLASSPATH" ]; then
28+
CLASSPATH=$PARAMETER_CLASSPATH
29+
fi
2830

29-
if [ ! -z "$PARAMETER_REFLECTION_PATH" ]; then
30-
REFLECTION_PATH=$PARAMETER_REFLECTION_PATH
31-
fi
31+
if [ ! -z "$PLUGIN_REFLECTION_PATH" ]; then
32+
REFLECTION_PATH=$PLUGIN_REFLECTION_PATH
33+
elif [ ! -z "$PARAMETER_REFLECTION_PATH" ]; then
34+
REFLECTION_PATH=$PARAMETER_REFLECTION_PATH
3235
fi
3336

37+
3438
if [ ! -z "$MAIN_CLASS" ]; then
3539
ALL_OPTS="$ALL_OPTS -m $MAIN_CLASS"
3640
fi

0 commit comments

Comments
 (0)