Skip to content

Commit

Permalink
Merge pull request #45 from maxkratz/hotfix/general-stability-improve…
Browse files Browse the repository at this point in the history
…ments

Integrates some minor enhancements (stability)
  • Loading branch information
maxkratz committed May 4, 2022
2 parents 3067397 + 1e34053 commit fc6cb53
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 3 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
branches:
- main
- 'testing/**'
- 'feature/**'
- 'hotfix/**'
# Run pipeline for release tags
tags:
- 'v*.*.*'
Expand Down Expand Up @@ -65,7 +67,6 @@ jobs:
name: com.seeq.eclipse.importprojects.jar
path: com.seeq.eclipse.importprojects.jar


# Create splash image
create-splash-image:
runs-on: [ubuntu-20.04]
Expand All @@ -75,7 +76,7 @@ jobs:
- name: Start message
run: echo "Creating splash image for version $VERSION."
- name: Run splash creator script
run: chmod +x splash.sh && ./splash.sh img $VERSION
run: chmod +x splash.sh && ./splash.sh img $VERSION null
- name: Upload artifact
uses: actions/upload-artifact@v2
with:
Expand Down
5 changes: 4 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ while [[ "$#" -gt 0 ]]; do
shift
done

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

#
# Config and URLs
Expand Down
17 changes: 17 additions & 0 deletions splash.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,27 @@ ECLIPSE_BASE_PATH=$3
REGEX_ECLIPSE_INI='s/org.eclipse.epp.package.common/org.emoflon.splash/g'
REGEX_CONFIG_INI='s/osgi.splashPath=platform\\:\/base\/plugins\/org.eclipse.platform/osgi.splashPath=platform\\:\/base\/plugins\/org.emoflon.splash/g'

# Check for existing ENVs
if [[ -z "$MODE" ]]; then
echo "=> No mode ENV found. Exit."; exit 1 ;
fi
if [[ -z "$VERSION" ]]; then
echo "=> No version ENV found. Exit."; exit 1 ;
fi
if [[ -z "$ECLIPSE_BASE_PATH" ]]; then
echo "=> No Eclipse base path ENV found. Exit."; exit 1 ;
fi

if [[ "$MODE" = "img" ]]; then
convert ./resources/emoflon-splash_template.png -font Liberation-Sans -pointsize 24 -draw "gravity south fill white text 0,15 '${VERSION}'" splash.bmp
elif [[ "$MODE" = "deploy" ]]; then
mkdir -p $ECLIPSE_BASE_PATH/plugins/org.emoflon.splash

# check if splash.bmp exists
if [[ ! -f splash.bmp ]]; then
echo "=> splash.bmp not found. Exit."; exit 1 ;
fi

mv splash.bmp $ECLIPSE_BASE_PATH/plugins/org.emoflon.splash
if [[ "$(uname)" == "Darwin" ]]; then
# sed on macOS needs a special treatment
Expand Down

0 comments on commit fc6cb53

Please sign in to comment.