From c9ffae54a07282dfdebd304649fd2876f76b942c Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Thu, 1 May 2025 15:18:32 +0200 Subject: [PATCH] Revert "[Build|GH] Add quick-fix to avoid need for EF-infrastrucutre" This reverts commit 420686a1230e14e62470ed1c1f1fd5a0b36a8235 added in - https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/pull/2997 --- .../install-maven-parent-action/action.yml | 26 ------------------- .github/workflows/checkVersions.yml | 10 ------- .github/workflows/codeQLworkflow.yml | 10 ------- .github/workflows/mavenBuild.yml | 10 ------- 4 files changed, 56 deletions(-) delete mode 100644 .github/actions/install-maven-parent-action/action.yml diff --git a/.github/actions/install-maven-parent-action/action.yml b/.github/actions/install-maven-parent-action/action.yml deleted file mode 100644 index 729ad675018..00000000000 --- a/.github/actions/install-maven-parent-action/action.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: 'Install Maven parent and SDK target' -description: 'Install the eclipse-parent pom.xml and Eclipse SDK target-platform into the local Maven cache in order to avoid the need for EF-infrastructure (which is currently unavailable).' - -runs: - using: "composite" - steps: - - name: Checkout eclipse.platform.releng.aggregator - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - repository: eclipse-platform/eclipse.platform.releng.aggregator - path: eclipse.platform.releng.aggregator - sparse-checkout: | - eclipse-platform-parent - eclipse.platform.releng.prereqs.sdk - - name: Install eclipse-parent poms - working-directory: eclipse.platform.releng.aggregator - shell: bash - run: | - cd eclipse-platform-parent - mvn clean install - cd .. - cd eclipse.platform.releng.prereqs.sdk - mvn clean install - - name: Remove eclipse.platform.releng.aggregator - shell: bash - run: 'rm -rf eclipse.platform.releng.aggregator' diff --git a/.github/workflows/checkVersions.yml b/.github/workflows/checkVersions.yml index 7d54891bbc9..a823007454b 100644 --- a/.github/workflows/checkVersions.yml +++ b/.github/workflows/checkVersions.yml @@ -26,18 +26,12 @@ on: type: string required: false default: '.' - without-EF-infra: - description: 'Whether to run this build without the need for EF-infrastructure (which is currently unavailable).' - type: boolean - required: false - default: true permissions: {} # all none env: MAVEN_ARGS: >- --batch-mode --no-transfer-progress - ${{ inputs.without-EF-infra && '-Dtycho.version=4.0.12' || '' }} jobs: versions-check-and-increment: @@ -61,10 +55,6 @@ jobs: with: maven-version: 3.9.9 - - name: Install Maven parent locally - uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/actions/install-maven-parent-action@master - if : inputs.without-EF-infra - - name: Additional setup if: inputs.extra-setup-command run: | diff --git a/.github/workflows/codeQLworkflow.yml b/.github/workflows/codeQLworkflow.yml index 984bf71756b..3aa8278b2f3 100644 --- a/.github/workflows/codeQLworkflow.yml +++ b/.github/workflows/codeQLworkflow.yml @@ -20,16 +20,10 @@ on: type: string required: false default: '3.9.9' - without-EF-infra: - description: 'Whether to run this build without the need for EF-infrastructure (which is currently unavailable).' - type: boolean - required: false - default: true env: MAVEN_ARGS: >- --batch-mode --no-transfer-progress - ${{ inputs.without-EF-infra && '-Dtycho.version=4.0.12' || '' }} jobs: analyze: @@ -88,10 +82,6 @@ jobs: with: maven-version: ${{ inputs.mavenVersion }} - - name: Install Maven parent locally - uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/actions/install-maven-parent-action@master - if : inputs.without-EF-infra - - name: Build with Maven run: >- ${{ runner.os == 'Linux' && 'xvfb-run' || '' }} diff --git a/.github/workflows/mavenBuild.yml b/.github/workflows/mavenBuild.yml index 5ee760745fa..70019d9d85e 100644 --- a/.github/workflows/mavenBuild.yml +++ b/.github/workflows/mavenBuild.yml @@ -20,18 +20,12 @@ on: type: string required: false default: '3.9.9' - without-EF-infra: - description: 'Whether to run this build without the need for EF-infrastructure (which is currently unavailable).' - type: boolean - required: false - default: true permissions: {} env: MAVEN_ARGS: >- --batch-mode --no-transfer-progress - ${{ inputs.without-EF-infra && '-Dtycho.version=4.0.12' || '' }} jobs: event_file: @@ -83,10 +77,6 @@ jobs: with: maven-version: ${{ inputs.mavenVersion }} - - name: Install Maven parent locally - uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/actions/install-maven-parent-action@master - if : inputs.without-EF-infra - - name: Build with Maven run: >- ${{ runner.os == 'Linux' && 'xvfb-run' || '' }}