Skip to content

Commit fc6cb53

Browse files
authored
Merge pull request #45 from maxkratz/hotfix/general-stability-improvements
Integrates some minor enhancements (stability)
2 parents 3067397 + 1e34053 commit fc6cb53

File tree

3 files changed

+24
-3
lines changed

3 files changed

+24
-3
lines changed

.github/workflows/ci.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
branches:
66
- main
77
- 'testing/**'
8+
- 'feature/**'
9+
- 'hotfix/**'
810
# Run pipeline for release tags
911
tags:
1012
- 'v*.*.*'
@@ -65,7 +67,6 @@ jobs:
6567
name: com.seeq.eclipse.importprojects.jar
6668
path: com.seeq.eclipse.importprojects.jar
6769

68-
6970
# Create splash image
7071
create-splash-image:
7172
runs-on: [ubuntu-20.04]
@@ -75,7 +76,7 @@ jobs:
7576
- name: Start message
7677
run: echo "Creating splash image for version $VERSION."
7778
- name: Run splash creator script
78-
run: chmod +x splash.sh && ./splash.sh img $VERSION
79+
run: chmod +x splash.sh && ./splash.sh img $VERSION null
7980
- name: Upload artifact
8081
uses: actions/upload-artifact@v2
8182
with:

build.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ while [[ "$#" -gt 0 ]]; do
1616
shift
1717
done
1818

19-
# TODO: Check if env VERSION is set
19+
# Check for existing ENVs
20+
if [[ -z "$VERSION" ]]; then
21+
echo "=> No version ENV found. Exit."; exit 1 ;
22+
fi
2023

2124
#
2225
# Config and URLs

splash.sh

+17
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,27 @@ ECLIPSE_BASE_PATH=$3
1111
REGEX_ECLIPSE_INI='s/org.eclipse.epp.package.common/org.emoflon.splash/g'
1212
REGEX_CONFIG_INI='s/osgi.splashPath=platform\\:\/base\/plugins\/org.eclipse.platform/osgi.splashPath=platform\\:\/base\/plugins\/org.emoflon.splash/g'
1313

14+
# Check for existing ENVs
15+
if [[ -z "$MODE" ]]; then
16+
echo "=> No mode ENV found. Exit."; exit 1 ;
17+
fi
18+
if [[ -z "$VERSION" ]]; then
19+
echo "=> No version ENV found. Exit."; exit 1 ;
20+
fi
21+
if [[ -z "$ECLIPSE_BASE_PATH" ]]; then
22+
echo "=> No Eclipse base path ENV found. Exit."; exit 1 ;
23+
fi
24+
1425
if [[ "$MODE" = "img" ]]; then
1526
convert ./resources/emoflon-splash_template.png -font Liberation-Sans -pointsize 24 -draw "gravity south fill white text 0,15 '${VERSION}'" splash.bmp
1627
elif [[ "$MODE" = "deploy" ]]; then
1728
mkdir -p $ECLIPSE_BASE_PATH/plugins/org.emoflon.splash
29+
30+
# check if splash.bmp exists
31+
if [[ ! -f splash.bmp ]]; then
32+
echo "=> splash.bmp not found. Exit."; exit 1 ;
33+
fi
34+
1835
mv splash.bmp $ECLIPSE_BASE_PATH/plugins/org.emoflon.splash
1936
if [[ "$(uname)" == "Darwin" ]]; then
2037
# sed on macOS needs a special treatment

0 commit comments

Comments
 (0)