From e718cfabb31bbd718ee20a2fc820e90b06945ecd Mon Sep 17 00:00:00 2001 From: Andi Huber Date: Mon, 17 Apr 2023 08:56:01 +0200 Subject: [PATCH] CAUSEWAY-3400: try fixing build (6) --- .../ci-build-artifacts-no-push-maven.yml | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci-build-artifacts-no-push-maven.yml b/.github/workflows/ci-build-artifacts-no-push-maven.yml index 0434665de81..de700b4130c 100644 --- a/.github/workflows/ci-build-artifacts-no-push-maven.yml +++ b/.github/workflows/ci-build-artifacts-no-push-maven.yml @@ -99,8 +99,8 @@ jobs: with: languages: ${{ matrix.language }} - - name: Build Artifacts (Main) - if: matrix.language == 'java' && env.BRANCH_NAME == 'master' + - name: Build Artifacts + if: matrix.language == 'java' shell: bash run: bash $CI_SCRIPTS_PATH/build-artifacts.sh env: @@ -117,24 +117,6 @@ jobs: -Denforcer.failFast=true -e - - name: Build Artifacts (Edge) - if: matrix.language == 'java' && env.BRANCH_NAME == 'spring6' - shell: bash - run: bash $CI_SCRIPTS_PATH/build-artifacts.sh - env: - # -Dmodule-all ... build all modules (default if all is well) - # -Dmodule-all-except-incubator ... build all modules except 'incubator' (eg. when vaadin build fails) - # -Dmodule-all-except-kroviz ... build all modules except 'kroviz' (eg. when kroviz build fails) - # -Denforcer.failFast=true ... fail fast on convergence issues (enforcer plugin) - # -Dmaven.source.skip=true ... no need for the CI build to pull sources - # -T 1C ... 1 build thread per core - MVN_ADDITIONAL_OPTS: >- - -Dmodule-all-except-kroviz - -Dproject.build.outputTimestamp=1 - -Dmaven.source.skip=true - -Denforcer.failFast=true - -e - # Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java). # If this step fails, then you should remove it and run the build manually - name: "CodeQL: Autobuild"