Reorganise modules

This commit is contained in:
Corneil du Plessis
2022-10-18 13:40:19 +02:00
parent 6a3b08ec6c
commit 019a7eb5ce
3 changed files with 20 additions and 10 deletions

View File

@@ -13,6 +13,11 @@ on:
required: false
default: 'main'
description: 'Version Tag'
verbose:
type: boolean
required: false
default: false
description: 'Verbose output'
secrets:
DOCKER_HUB_USERNAME:
DOCKER_HUB_PASSWORD:
@@ -39,6 +44,8 @@ jobs:
run: find . -type f -name "*.sh" -exec chmod a+x '{}' \;
- name: 'Configure: create streams applications matrix'
shell: bash
env:
VERBOSE: ${{ inputs.verbose && 'true' || '' }}
run: |
ROOT_DIR=$(realpath $PWD)
pushd stream-applications > /dev/null
@@ -180,13 +187,13 @@ jobs:
run: |
ROOT_DIR=$(realpath $PWD)
echo "::notice ::building - stream-applications-build"
$ROOT_DIR/mvnw -s $ROOT_DIR/.settings.xml deploy -f stream-applications-build -U
$ROOT_DIR/mvnw ${{ inputs.verbose && '--debug' || '' }} -s $ROOT_DIR/.settings.xml deploy -f stream-applications-build -U
echo "::notice ::building - functions"
$ROOT_DIR/mvnw -s $ROOT_DIR/.settings.xml deploy -f functions -N -U
$ROOT_DIR/mvnw ${{ inputs.verbose && '--debug' || '' }} -s $ROOT_DIR/.settings.xml deploy -f functions -N -U
echo "::notice ::building - function-dependencies"
$ROOT_DIR/mvnw -s $ROOT_DIR/.settings.xml deploy -f functions/function-dependencies -N -U
$ROOT_DIR/mvnw ${{ inputs.verbose && '--debug' || '' }} -s $ROOT_DIR/.settings.xml deploy -f functions/function-dependencies -N -U
echo "::notice ::building - stream-applications-core"
$ROOT_DIR/mvnw -s $ROOT_DIR/.settings.xml deploy -f applications/stream-applications-core -N -U
$ROOT_DIR/mvnw ${{ inputs.verbose && '--debug' || '' }} -s $ROOT_DIR/.settings.xml deploy -f applications/stream-applications-core -N -U
echo "::notice ::core build completed"
processors:
needs:

View File

@@ -25,18 +25,21 @@ check_env DOCKER_HUB_USERNAME
check_env DOCKER_HUB_PASSWORD
check_env VERSION
ROOT_DIR=$PWD
ROOT_DIR=$(realpath $PWD)
if [ "$VERBOSE" == "true" ]; then
MAVEN_OPT=--debug
fi
pushd $APP_FOLDER > /dev/null
$ROOT_DIR/mvnw -s $ROOT_DIR/.settings.xml clean install
$ROOT_DIR/mvnw $MAVEN_OPT -s $ROOT_DIR/.settings.xml clean install
rm -rf apps
if [ -d "src/main/java" ]; then
$ROOT_DIR/mvnw -s $ROOT_DIR/.settings.xml deploy -U -Pintegration
$ROOT_DIR/mvnw $MAVEN_OPT -s $ROOT_DIR/.settings.xml deploy -U -Pintegration
else
$ROOT_DIR/mvnw -s $ROOT_DIR/.settings.xml package -U -Pintegration
$ROOT_DIR/mvnw $MAVEN_OPT -s $ROOT_DIR/.settings.xml package -U -Pintegration
fi
pushd apps
$ROOT_DIR/mvnw -s $ROOT_DIR/.settings.xml package jib:build -DskipTests \
$ROOT_DIR/mvnw $MAVEN_OPT -s $ROOT_DIR/.settings.xml package jib:build -DskipTests \
-Djib.to.tags="$VERSION" \
-Djib.httpTimeout=1800000 \
-Djib.to.auth.username="$DOCKER_HUB_USERNAME" \

View File

@@ -11,8 +11,8 @@
<packaging>pom</packaging>
<modules>
<module>common</module>
<module>spring-functions-parent</module>
<module>common</module>
<module>consumer</module>
<module>function</module>
<module>supplier</module>