Skip to content

Commit

Permalink
Merge pull request #27 from virtualsatellite/integration
Browse files Browse the repository at this point in the history
Release 4.10.0
  • Loading branch information
PhilMFischer authored Dec 5, 2019
2 parents 2dba4be + ad98fad commit 611a595
Show file tree
Hide file tree
Showing 33 changed files with 438 additions and 177 deletions.
14 changes: 14 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
andriikovalov-dlr <andrii.kovalov@dlr.de> andriikovalov-dlr <48556822+andriikovalov-dlr@users.noreply.github.com>
andriikovalov-dlr <andrii.kovalov@dlr.de> kova_an <andrii.kovalov@dlr.de>

franzTobiasDLR <tobias.franz@dlr.de> franzTobiasDLR <49645871+franzTobiasDLR@users.noreply.github.com>
franzTobiasDLR <tobias.franz@dlr.de> Tobias Franz <tobias.franz@dlr.de>

SaMuellerDLR <sa.mueller@dlr.de> Müller, Sascha ( SC-SRV ) <sa.mueller@dlr.de>
SaMuellerDLR <sa.mueller@dlr.de> SaMuellerDLR <48356419+SaMuellerDLR@users.noreply.github.com>
SaMuellerDLR <sa.mueller@dlr.de> Sascha Müller <sa.mueller@dlr.de>

PhilMFischer <philipp.fischer@dlr.de> Philipp M. Fischer <35496033+PhilMFischer@users.noreply.github.com>
PhilMFischer <philipp.fischer@dlr.de> Philipp M. Fischer <philipp.fischer@dlr.de>

TjorveKujathDLR <tjorve.kujath@dlr.de> Tjorve Kujath <tjorve.kujath@dlr.de>
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
eclipse.preferences.version=1
encoding/<project>=UTF-8
2 changes: 2 additions & 0 deletions .settings/org.eclipse.core.runtime.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
line.separator=\n
47 changes: 23 additions & 24 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
language: java

dist: xenial

jdk:
- oraclejdk8
- openjdk8

cache:
directories:
- $HOME/.m2

before_script:
# -----------------------------------
# Make sure scripts are executable
# -----------------------------------
- chmod 700 bash/*

install:
- true

Expand All @@ -15,6 +23,7 @@ stages:
# Just one stage, multiple stages
# with maven overcomplicate the things
# ------------------------------------
- name: verify
- name: build-assemble-deploy

env:
Expand All @@ -26,6 +35,15 @@ env:

jobs:
include:
# --------------------------------------------
# Run a quicksanity check if all commits are
# handed in by known users
#---------------------------------------------
- stage: verify
name: Verify - Authors Sanity Check
script:
- ./bash/verify_commit_authors.sh known_authors.txt

# -----------------------------------------------------------
# -----------------------------------------------------------
# Here are the jobs for the assemble and deploy stage
Expand All @@ -35,12 +53,7 @@ jobs:
if: branch NOT IN (integration, development, integration_snapshot, development_snapshot) AND NOT (tag =~ /^Release/)
name: Build-Assemble-Deploy - Feature
script:
# -------------------------------------------------------
# call the maven build and store the output in a log file
# -------------------------------------------------------
- mvn install -P development,deployUnsecured -B -V | tee maven.log
- echo "Check for Maven Problems on Product:"
- (grep -n "\[ERROR\]" maven.log || exit 0 && exit 1;)
- bash/maven_build.sh -j assemble -p development

# -----------------------------------------------------------
# Deploy Jobs for unsecured Development.
Expand All @@ -49,12 +62,7 @@ jobs:
if: branch = development
name: Build-Assemble-Deploy - Development
script:
# -------------------------------------------------------
# call the maven build and store the output in a log file
# -------------------------------------------------------
- mvn install -P development,deployUnsecured -B -V | tee maven.log
- echo "Check for Maven Problems on Product:"
- (grep -n "\[ERROR\]" maven.log || exit 0 && exit 1;)
- bash/maven_build.sh -j assemble -p development
before_deploy:
# -----------------------------------------------------------
# Update the development tag beforehand
Expand Down Expand Up @@ -95,12 +103,7 @@ jobs:
if: branch = integration
name: Build-Assemble-Deploy - Integration
script:
# -------------------------------------------------------
# call the maven build and store the output in a log file
# -------------------------------------------------------
- mvn install -P integration,deployUnsecured -B -V | tee maven.log
- echo "Check for Maven Problems on Product:"
- (grep -n "\[ERROR\]" maven.log || exit 0 && exit 1;)
- bash/maven_build.sh -j assemble -p integration
before_deploy:
# -----------------------------------------------------------
# Update the development tag beforehand
Expand Down Expand Up @@ -141,11 +144,7 @@ jobs:
if: tag =~ /^Release/
name: Build-Assemble-Deploy - Release
script:
# -------------------------------------------------------
# call the maven build and store the output in a log file
- mvn install -P release,deployBackuped -B -V | tee maven.log
- echo "Check for Maven Problems on Product:"
- (grep -n "\[ERROR\]" maven.log || exit 0 && exit 1;)
- bash/maven_build.sh -j assemble -p release
deploy:
# -----------------------------------------------------------
# Now attach the release to the Release Tag.
Expand Down
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,13 @@ Deployments are done using GitHub Releases.

## Contribution

To contribute to this project follow the given steps:
We are happy to receive your contributions. Nevertheless in such a big project there is a lot to respect and to obey.
One thing to respect are legal requirements such as authorship rights and privacy protection.
Therefore, before we can accept your contributions we need you to sign our *Contributor License Agreement (CLA)*.

Please follow the process described in *[Virtual Satellite 4 - Core](https://github.com/virtualsatellite/VirtualSatellite4-Core)* to become an authorized contributor.

Once you are an authorized committer feel free to contribute. We will not activate your account within our organization. Therefore use Pull-Requests to contribute:

1. Create your own fork of the project.
2. Apply your changes.
Expand Down
99 changes: 99 additions & 0 deletions bash/maven_build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
#!/bin/bash

#/*******************************************************************************
# * Copyright (c) 2008-2019 German Aerospace Center (DLR), Simulation and Software Technology, Germany.
# *
# * This program and the accompanying materials are made available under the
# * terms of the Eclipse Public License 2.0 which is available at
# * http://www.eclipse.org/legal/epl-2.0.
# *
# * SPDX-License-Identifier: EPL-2.0
# *******************************************************************************/

# --------------------------------------------------------------------------
# This script handles the different calls to maven
# --------------------------------------------------------------------------

# fail the script if a call fails
set -e

# Store the name of the command calling from commandline to be properly
# displayed in case of usage issues
COMMAND=$0

# this method gives some little usage info
printUsage() {
echo "usage: ${COMMAND} -j [assemble] -p [development|integration|release]"
echo ""
echo "Options:"
echo " -j, --jobs <jobname> The name of the Travis-CI job to be build."
echo " -p, --profile <profile> The name of the maven profile to be build."
echo ""
echo "Jobname:"
echo " assemble To run full assemble including the java docs build."
echo ""
echo "Profile:"
echo " development Maven profile for development and feature builds."
echo " integration Maven profile for integration builds."
echo " release Maven profile for release builds. Fails to overwrite deployments."
echo ""
echo "Copyright by DLR (German Aerospace Center)"
}

checkforMavenProblems() {
echo "Check for Maven Problems on Product:"
(grep -n "\[\(WARN\|WARNING\|ERROR\)\]" maven.log \
| grep -v "\[WARNING\] Checksum validation failed" \
| grep -v "\[WARNING\] Could not validate integrity of download" \
| grep -v "\[WARNING\] The following locally built units have been used" \
| grep -v "\[WARNING\] tooling" \
|| exit 0 && exit 1;)
}

callMavenAssemble() {
if [ "$MAVEN_PROFILE" == "release" ] ; then
DEPLOY_TYPE="deployBackuped"
else
DEPLOY_TYPE="deployUnsecured"
fi
echo "Maven - Assemlbe - ${MAVEN_PROFILE} - ${DEPLOY_TYPE}"
(grep -n "\[\(WARN\|ERROR\)\]" maven.log || exit 0 && exit 1;)
mvn clean install -P ${MAVEN_PROFILE},${DEPLOY_TYPE} -B -V | tee maven.log
checkforMavenProblems
}


# process all command line arguments
while [ "$1" != "" ]; do
case $1 in
-j | --jobs ) shift
TRAVIS_JOB=$1
;;
-p | --profile ) shift
MAVEN_PROFILE=$1
;;
-h | --help ) printUsage
exit
;;
* ) printUsage
exit 1
esac
shift
done

case $MAVEN_PROFILE in
development ) ;;
integration ) ;;
release ) ;;
* ) printUsage
exit 1
esac

# Decide which job to run
case $TRAVIS_JOB in
assemble ) callMavenAssemble
exit
;;
* ) printUsage
exit 1
esac
Loading

0 comments on commit 611a595

Please sign in to comment.