Skip to content

Commit 420686a

Browse files
committed
[Build|GH] Add quick-fix to avoid need for EF-infrastrucutre
1 parent cf19c23 commit 420686a

File tree

4 files changed

+70
-2
lines changed

4 files changed

+70
-2
lines changed
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: 'Install Maven parent and SDK target'
2+
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).'
3+
inputs:
4+
tycho-version:
5+
description: 'The tycho release to use.'
6+
required: true
7+
runs:
8+
using: "composite"
9+
steps:
10+
- name: Checkout eclipse.platform.releng.aggregator
11+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
12+
with:
13+
repository: eclipse-platform/eclipse.platform.releng.aggregator
14+
path: eclipse.platform.releng.aggregator
15+
sparse-checkout: |
16+
eclipse-platform-parent
17+
eclipse.platform.releng.prereqs.sdk
18+
- name: Install eclipse-parent poms
19+
working-directory: eclipse.platform.releng.aggregator
20+
shell: bash
21+
run: |
22+
cd eclipse-platform-parent
23+
mvn clean install -B -ntp -Dtycho.version=${{ inputs.tycho-version }}
24+
cd ..
25+
cd eclipse.platform.releng.prereqs.sdk
26+
mvn clean install -B -ntp -Dtycho.version=${{ inputs.tycho-version }}
27+
- name: Remove eclipse.platform.releng.aggregator
28+
shell: bash
29+
run: 'rm -rf eclipse.platform.releng.aggregator'

.github/workflows/checkVersions.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ on:
2626
type: string
2727
required: false
2828
default: '.'
29+
without-EF-infra:
30+
description: 'Whether to run this build without the need for EF-infrastructure (which is currently unavailable).'
31+
type: boolean
32+
required: false
33+
default: true
2934

3035
permissions: {} # all none
3136

@@ -51,6 +56,12 @@ jobs:
5156
with:
5257
maven-version: 3.9.9
5358

59+
- name: Install Maven parent locally
60+
uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/actions/install-maven-parent-action@master
61+
if : inputs.without-EF-infra
62+
with:
63+
tycho-version: 4.0.12
64+
5465
- name: Additional setup
5566
if: inputs.extra-setup-command
5667
run: |
@@ -66,6 +77,7 @@ jobs:
6677
mvn verify ${{ inputs.extra-maven-args }} -DskipTests -Dcompare-version-with-baselines.skip=false
6778
org.eclipse.tycho:tycho-versions-plugin:bump-versions -Dtycho.bump-versions.increment=100
6879
--threads 1C --fail-at-end --batch-mode --no-transfer-progress --show-version
80+
${{ inputs.without-EF-infra && '-Dtycho.version=4.0.12' || '' }}
6981
7082
- name: Commit version increments, if any
7183
run: |
@@ -79,7 +91,8 @@ jobs:
7991
8092
# Read 'releaseNumberSDK' property as stream version
8193
pushd ${{ inputs.working-directory }}
82-
mvn help:evaluate -Dexpression=releaseNumberSDK ${{ inputs.extra-maven-args }} --quiet '-Doutput=releaseNumberSDK-value.txt'
94+
mvn help:evaluate -Dexpression=releaseNumberSDK ${{ inputs.extra-maven-args }} --quiet '-Doutput=releaseNumberSDK-value.txt' \
95+
${{ inputs.without-EF-infra && '-Dtycho.version=4.0.12' || '' }}
8396
streamVersion=$(<releaseNumberSDK-value.txt)
8497
rm -f releaseNumberSDK-value.txt
8598
popd

.github/workflows/codeQLworkflow.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ on:
2020
type: string
2121
required: false
2222
default: '3.9.9'
23+
without-EF-infra:
24+
description: 'Whether to run this build without the need for EF-infrastructure (which is currently unavailable).'
25+
type: boolean
26+
required: false
27+
default: true
2328

2429
jobs:
2530
analyze:
@@ -77,11 +82,19 @@ jobs:
7782
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
7883
with:
7984
maven-version: ${{ inputs.mavenVersion }}
85+
86+
- name: Install Maven parent locally
87+
uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/actions/install-maven-parent-action@master
88+
if : inputs.without-EF-infra
89+
with:
90+
tycho-version: 4.0.12
91+
8092
- name: Build with Maven
8193
uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
8294
with:
8395
run: >-
8496
mvn --batch-mode -V -U
97+
${{ inputs.without-EF-infra && '-Dtycho.version=4.0.12' || '' }}
8598
-ntp
8699
-Dcompare-version-with-baselines.skip=true
87100
-Pbree-libs

.github/workflows/mavenBuild.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,16 @@ on:
1515
type: string
1616
required: false
1717
default: 'false'
18-
mavenVersion:
18+
mavenVersion:
1919
description: 'The version of Maven set up'
2020
type: string
2121
required: false
2222
default: '3.9.9'
23+
without-EF-infra:
24+
description: 'Whether to run this build without the need for EF-infrastructure (which is currently unavailable).'
25+
type: boolean
26+
required: false
27+
default: true
2328

2429
permissions: {}
2530

@@ -68,6 +73,13 @@ jobs:
6873
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
6974
with:
7075
maven-version: ${{ inputs.mavenVersion }}
76+
77+
- name: Install Maven parent locally
78+
uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/actions/install-maven-parent-action@master
79+
if : inputs.without-EF-infra
80+
with:
81+
tycho-version: 4.0.12
82+
7183
- name: Download the API Tools matcher
7284
uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9 # v1.6.0
7385
id: api-tools-matcher
@@ -80,6 +92,7 @@ jobs:
8092
with:
8193
run: >-
8294
mvn --batch-mode -V -U -e
95+
${{ inputs.without-EF-infra && '-Dtycho.version=4.0.12' || '' }}
8396
-ntp
8497
-Dcompare-version-with-baselines.skip=false
8598
-Pbree-libs

0 commit comments

Comments
 (0)