SpringCloud/stream-applications
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[GitHub Actions] fix extracting Maven project version. (#397)

Browse Source 
* Fix extracting Maven project version.
* Rename elements from scdf- to stream-ci- in Terraform to create cluster.
This commit is contained in:
Corneil du Plessis
2022-10-26 13:45:26 +02:00
committed by GitHub
parent 28ac91224d
commit 7b327c7ee3
6 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/common.yml vendored
View File

@@ -207,6 +207,7 @@ jobs:
env:
CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
VERBOSE: ${{ inputs.verbose }}
run: |
ROOT_DIR=$(realpath $PWD)
echo "::notice ::building - stream-applications-build"
@@ -219,7 +220,7 @@ jobs:
set +e
echo "::notice ::building - function-dependencies"
set -e
$ROOT_DIR/mvnw ${{ inputs.verbose && '--debug' || '' }} -s $ROOT_DIR/.settings.xml deploy -f functions/function-dependencies
$ROOT_DIR/mvnw ${{ inputs.verbose && '--debug' || '' }} -s $ROOT_DIR/.settings.xml deploy -f function-dependencies
set +e
echo "::notice ::building - stream-applications-core"
set -e
@@ -262,6 +263,7 @@ jobs:
CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }}
VERBOSE: ${{ inputs.verbose }}
run: ./build-app.sh "stream-applications/applications/processor/${{ matrix.app }}"
- name: 'Publish: ${{ matrix.app }}'
shell: bash
@@ -269,6 +271,7 @@ jobs:
DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }}
VERBOSE: ${{ inputs.verbose }}
run: ./publish-app.sh "stream-applications/applications/processor/${{ matrix.app }}"
sinks:
if: ${{ needs.parameters.outputs.sinks != '' && needs.parameters.outputs.sinks != null }}
@@ -312,6 +315,7 @@ jobs:
DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }}
VERBOSE: ${{ inputs.verbose }}
run: ./publish-app.sh "stream-applications/applications/sink/${{ matrix.app }}"
sources:
if: ${{ needs.parameters.outputs.sources != '' && needs.parameters.outputs.sources != null }}
@@ -349,6 +353,7 @@ jobs:
CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }}
VERBOSE: ${{ inputs.verbose }}
run: ./build-app.sh "stream-applications/applications/source/${{ matrix.app }}"
- name: 'Publish: ${{ matrix.app }}'
shell: bash
@@ -356,6 +361,7 @@ jobs:
DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }}
VERBOSE: ${{ inputs.verbose }}
run: ./publish-app.sh "stream-applications/applications/source/${{ matrix.app }}"
# scale-down-runners:
# if: ${{ success() }}

5
build-app.sh
View File

@@ -33,10 +33,7 @@ else
MAVEN_OPT=-q
fi
if [ "$VERSION" == "" ]; then
VERSIONS=$($SCDIR/mvnw exec:exec -Dexec.executable='echo' -Dexec.args='${project.version}' --non-recursive -q | sed 's/\"//g')
for v in $VERSIONS; do
VERSION=$v
done
VERSION=$($SCDIR/mvn-get-version.sh)
fi
echo "Project Version:$VERSION"
if [ "$LOCAL" == "true" ]; then

6
build-core.sh
View File

@@ -24,7 +24,7 @@ else
MAVEN_GOAL="install deploy"
fi
# -T 2C
./mvnw $MAVEN_OPT -s ./.settings.xml $MAVEN_GOAL -f stream-applications-build -U
./mvnw $MAVEN_OPT -s ./.settings.xml $MAVEN_GOAL -T 1.5C -f stream-applications-build -U
./mvnw $MAVEN_OPT -s ./.settings.xml $MAVEN_GOAL -T 1.5C -f functions -U
./mvnw $MAVEN_OPT -s ./.settings.xml $MAVEN_GOAL -f functions/function-dependencies -U
./mvnw $MAVEN_OPT -s ./.settings.xml $MAVEN_GOAL -f applications/stream-applications-core -U
./mvnw $MAVEN_OPT -s ./.settings.xml $MAVEN_GOAL -T 1.5C -f function-dependencies
./mvnw $MAVEN_OPT -s ./.settings.xml $MAVEN_GOAL -T 1.5C -f applications/stream-applications-core -U

9
mvn-get-version.sh Executable file
View File

@@ -0,0 +1,9 @@
#!/usr/bin/env bash
SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
SCDIR=$(realpath $SCDIR)
VERSIONS=$($SCDIR/mvnw exec:exec -Dexec.executable='echo' -Dexec.args='${project.version}' --non-recursive -q | sed 's/\"//g' | sed 's/version=//g')
for v in $VERSIONS; do
VERSION=$v
done
echo "$VERSION"

5
publish-app.sh
View File

@@ -23,10 +23,7 @@ if [ "$1" == "" ]; then
fi
APP_FOLDER=$1
if [ "$VERSION" == "" ]; then
VERSIONS=$($SCDIR/mvnw exec:exec -Dexec.executable='echo' -Dexec.args='${project.version}' --non-recursive -q | sed 's/\"//g')
for v in $VERSIONS; do
VERSION=$v
done
VERSION=$($SCDIR/mvn-get-version.sh)
fi
echo "Project Version:$VERSION"
if [[ "$VERSION" == "4."* ]]; then

6
scripts/terraform/stream-apps-gh-runners/main.tf
View File

@@ -1,5 +1,5 @@
variable "cluster_name" {
default = "scdf-empty"
default = "stream-ci-empty"
}
variable "region" {
default = "us-central1"
@@ -93,7 +93,7 @@ resource "google_container_node_pool" "nodes" {
disk_size_gb = var.disk_size
disk_type = "pd-ssd"
image_type = "UBUNTU_CONTAINERD"
tags = ["scdf-node", var.cluster_name, "${var.cluster_name}-node"]
tags = ["stream-ci-node", var.cluster_name, "${var.cluster_name}-node"]
}
management {
auto_upgrade = false
@@ -133,7 +133,7 @@ resource "google_container_cluster" "primary" {
}
}
resource "google_compute_firewall" "scdf-fw" {
resource "google_compute_firewall" "stream-ci-fw" {
name = "${var.cluster_name}-firewall"
network = google_compute_network.vpc.name