diff --git a/.github/workflows/backend-build.yml b/.github/workflows/backend-build.yml index 389934cdd34..6419271ebf5 100644 --- a/.github/workflows/backend-build.yml +++ b/.github/workflows/backend-build.yml @@ -27,8 +27,6 @@ jobs: java-version: "21" cache: maven - - uses: dbeaver/github-actions/install-maven@devel - - name: Run build script run: ./build-backend.sh shell: bash diff --git a/.github/workflows/push-pr-devel.yml b/.github/workflows/push-pr-devel.yml index bb58d4b7024..f979ed9c5f7 100644 --- a/.github/workflows/push-pr-devel.yml +++ b/.github/workflows/push-pr-devel.yml @@ -15,7 +15,7 @@ concurrency: jobs: build-server: - uses: dbeaver/dbeaver-common/.github/workflows/mvn-package.yml@devel + uses: dbeaver/dbeaver-common/.github/workflows/mvn-package.yml@dbeaver/dbeaver-devops#2370-mvnw name: Check secrets: inherit with: diff --git a/deploy/build-backend.sh b/deploy/build-backend.sh index ba401ce61f8..28e1ddfa342 100755 --- a/deploy/build-backend.sh +++ b/deploy/build-backend.sh @@ -1,9 +1,12 @@ -#!/bin/bash +#!/usr/bin/env bash + set -Eeo pipefail set +u echo "Clone and build Cloudbeaver" +script_dir="$(realpath "$(dirname "$0")")" + rm -rf ./drivers rm -rf ./cloudbeaver mkdir ./cloudbeaver @@ -26,7 +29,7 @@ cd cloudbeaver/deploy echo "Build CloudBeaver server" cd ../server/product/aggregate -mvn clean verify $MAVEN_COMMON_OPTS -Dheadless-platform +"$script_dir/../../dbeaver-common/mvnw" clean verify "${MAVEN_COMMON_OPTS--T1C}" -Dheadless-platform if [[ "$?" -ne 0 ]] ; then echo 'Could not perform package'; exit $rc fi @@ -42,4 +45,4 @@ cp -rp ../config/core/* cloudbeaver/conf cp -rp ../config/GlobalConfiguration/.dbeaver/data-sources.json cloudbeaver/conf/initial-data-sources.conf mv drivers cloudbeaver -echo "End of backend build" \ No newline at end of file +echo "End of backend build"