diff --git a/.github/workflows/build-on-pull-request.yml b/.github/workflows/build-on-pull-request.yml index eb267c9f9..525816207 100644 --- a/.github/workflows/build-on-pull-request.yml +++ b/.github/workflows/build-on-pull-request.yml @@ -14,11 +14,6 @@ jobs: java-version: 11 distribution: 'zulu' - - name: Use Node.js 18.10 - uses: actions/setup-node@v3 - with: - node-version: '18.10' - - name: Check out xyna-factory uses: actions/checkout@v3 @@ -26,17 +21,14 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - gh pr diff {{ github.event.pull_request.number }} --name-only | grep '^modules/' | cut -f 2-3 -d/ | sort | uniq | tee changed-modules.txt - echo "CHANGES=$(cat changed-modules.txt | wc -l)" >> "$GITHUB_ENV" + gh pr diff ${{ github.event.pull_request.number }} --name-only | grep '^modules/' | cut -f 2-3 -d/ | sort | uniq | tee changed-modules.txt - name: build basic factory run: | cd installation ./build.sh build - if: env.CHANGES > 0 - name: build changed modules run: | cd modules for d in $(cat ../changed-modules.txt); do test -d "$d" && ant -Doracle.home=/tmp -f "$d/build.xml"; done - if: env.CHANGES > 0 diff --git a/.github/workflows/nightbuild.yml b/.github/workflows/nightbuild.yml index 45137a4cc..7f9637db2 100644 --- a/.github/workflows/nightbuild.yml +++ b/.github/workflows/nightbuild.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - node-version: [16.x] + node-version: [18.x] java-version: [11] steps: @@ -39,8 +39,4 @@ jobs: - name: build run: | cd installation - ./updateVersion.sh $(grep "release.number=v" ./delivery/delivery.properties | sed 's/release.number=v//g') - sed -i 's/# main/set -e/' ./build.sh - sed -i 's/nvm --version//' ./build.sh - sed -i 's/nvm use .*//' ./build.sh ./build.sh all diff --git a/installation/build.sh b/installation/build.sh index ed80d3f78..1285daa0a 100755 --- a/installation/build.sh +++ b/installation/build.sh @@ -29,10 +29,13 @@ check_dependencies() { mvn --version ant -version git --version - node --version zip --version } +check_dependencies_frontend() { + node --version +} + checkout_factory() { echo "cheking out factory..." # $1 where to check out @@ -653,6 +656,7 @@ case $1 in build ;; "all") + check_dependencies_frontend build_all ;; "compose")