From 7634fea87e9cc5c5710386fd4b2c770722f07a4d Mon Sep 17 00:00:00 2001 From: Corneil du Plessis Date: Wed, 7 Dec 2022 16:25:35 +0200 Subject: [PATCH] Updated build for stream-applications-release-train. --- .github/workflows/common.yml | 72 ++++++++++++++++++- scripts/ceil.bc | 11 --- .../stream-applications-descriptor/pom.xml | 32 ++++++--- 3 files changed, 91 insertions(+), 24 deletions(-) delete mode 100644 scripts/ceil.bc diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index 83a67fc1..570ba8a4 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -480,6 +480,73 @@ jobs: DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }} MAVEN_THREADS: ${{ inputs.useMavenThreads }} run: ./publish-app.sh "stream-applications" "applications/source/${{ matrix.app }}" + release-train: + needs: + - core + - parameters + - scale-runners-up + runs-on: 'stream-ci' + steps: + - name: 'Configure: checkout stream-applications' + uses: actions/checkout@v3 + with: + ref: 'main' + - name: 'Configure: checkout stream-applications@${{ inputs.branch }}' + uses: actions/checkout@v3 + with: + ref: ${{ inputs.branch }} + path: 'stream-applications' + - name: Ensure scripts are executable + shell: bash + run: find . -type f -name "*.sh" -exec chmod a+x '{}' \; + - name: 'Configure: Install Java' + if: ${{ needs.parameters.outputs.jdk_build == '8' }} + uses: actions/setup-java@v1 + with: + java-version: ${{ needs.parameters.outputs.jdk_build }} + - name: 'Configure: Install GraalVM' + if: ${{ needs.parameters.outputs.jdk_build != '8' }} + uses: graalvm/setup-graalvm@v1 + with: + version: 'latest' + java-version: ${{ needs.parameters.outputs.jdk_build }} + # components: 'native-image' # add when starting native builds. + github-token: ${{ secrets.GITHUB_TOKEN }} + - name: 'Configure: cache for maven dependencies' + uses: actions/cache@v3 + with: + path: ~/.m2/repository + key: maven-repo-${{ hashFiles('**/pom.xml') }}-8-single-${{ inputs.branch }} + restore-keys: | + maven-repo-${{ hashFiles('**/pom.xml') }}-8-${{ inputs.branch }} + maven-repo-${{ hashFiles('**/pom.xml') }}-${{ inputs.branch }} + maven-repo-${{ inputs.branch }} + - name: 'Configure: Install Pack' + uses: ./.github/actions/install-pack + - name: 'Build: stream-applications-release-train' + shell: bash + env: + CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} + CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} + DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }} + MAVEN_THREADS: ${{ inputs.useMavenThreads }} + run: | + ROOT_DIR=$(realpath $PWD) + pushd stream-applications > /dev/null + echo "::notice ::building - stream-applications-release-train" + set -e + $ROOT_DIR/build-folder.sh stream-applications-release-train "install verify deploy" + set +e + echo "::notice ::stream-applications-release-train build completed" + popd > /dev/null + - name: 'Upload: Error logs' + if: ${{ failure() }} + uses: actions/upload-artifact@v3 + with: + name: '${{ matrix.app }}-surefire-reports' + path: '**/target/surefire-reports' + retention-days: 7 + if-no-files-found: ignore rerun-jobs: if: ${{ failure() && github.run_attempt == '1' }} runs-on: ubuntu-latest @@ -487,6 +554,7 @@ jobs: - sources - processors - sinks + - release-train steps: - name: 'Configure: Checkout stream-applications' uses: actions/checkout@v3 @@ -513,9 +581,7 @@ jobs: runs-on: ubuntu-latest needs: - parameters - - processors - - sinks - - sources + - release-train concurrency: group: stream-apps-gh-runners cancel-in-progress: false diff --git a/scripts/ceil.bc b/scripts/ceil.bc deleted file mode 100644 index 3eaf93e5..00000000 --- a/scripts/ceil.bc +++ /dev/null @@ -1,11 +0,0 @@ -define ceil(x) { - auto s, r - s = scale - scale = 0 - r = x / 1 - if(r < x) { - r = r + 1 - } - scale = s - return (r) -} diff --git a/stream-applications-release-train/stream-applications-descriptor/pom.xml b/stream-applications-release-train/stream-applications-descriptor/pom.xml index e0ae437e..44aa6c4e 100644 --- a/stream-applications-release-train/stream-applications-descriptor/pom.xml +++ b/stream-applications-release-train/stream-applications-descriptor/pom.xml @@ -1,5 +1,6 @@ - + stream-applications-release-train org.springframework.cloud.stream.app @@ -10,7 +11,6 @@ stream-applications-descriptor stream-applications-descriptor jar - @@ -31,9 +31,18 @@ - org.codehaus.gmaven - gmaven-plugin - 1.5 + org.codehaus.gmavenplus + gmavenplus-plugin + 2.1.0 + + + org.codehaus.groovy + groovy-all + 3.0.9 + pom + runtime + + validate @@ -41,12 +50,16 @@ execute - + + @@ -102,7 +115,6 @@ -