Skip to content

Commit 1400438

Browse files
committed
[FIXUP] Add quick-fix to avoid need for EF-infrastrucutre
1 parent ac43b31 commit 1400438

File tree

3 files changed

+59
-6
lines changed

3 files changed

+59
-6
lines changed

.github/workflows/checkVersions.yml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,28 @@ jobs:
5151
with:
5252
maven-version: 3.9.9
5353

54+
- name: Checkout eclipse.platform.releng.aggregator
55+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
56+
if : inputs.without-EF-infra
57+
with:
58+
repository: eclipse-platform/eclipse.platform.releng.aggregator
59+
path: eclipse.platform.releng.aggregator
60+
sparse-checkout: |
61+
eclipse-platform-parent
62+
eclipse.platform.releng.prereqs.sdk
63+
- name: Install eclipse-parent poms
64+
if : inputs.without-EF-infra
65+
working-directory: eclipse.platform.releng.aggregator
66+
run: |
67+
cd eclipse-platform-parent
68+
mvn clean install -B -ntp '-Dtycho.version=4.0.12'
69+
cd ..
70+
cd eclipse.platform.releng.prereqs.sdk
71+
mvn clean install -B -ntp '-Dtycho.version=4.0.12'
72+
- name: Remove eclipse.platform.releng.aggregator
73+
if : inputs.without-EF-infra
74+
run: 'rm -rf eclipse.platform.releng.aggregator'
75+
5476
- name: Additional setup
5577
if: inputs.extra-setup-command
5678
run: |
@@ -66,6 +88,7 @@ jobs:
6688
mvn verify ${{ inputs.extra-maven-args }} -DskipTests -Dcompare-version-with-baselines.skip=false
6789
org.eclipse.tycho:tycho-versions-plugin:bump-versions -Dtycho.bump-versions.increment=100
6890
--threads 1C --fail-at-end --batch-mode --no-transfer-progress --show-version
91+
${{ inputs.without-EF-infra && '-Dtycho.version=4.0.12' || '' }}
6992
7093
- name: Commit version increments, if any
7194
run: |
@@ -79,7 +102,8 @@ jobs:
79102
80103
# Read 'releaseNumberSDK' property as stream version
81104
pushd ${{ inputs.working-directory }}
82-
mvn help:evaluate -Dexpression=releaseNumberSDK ${{ inputs.extra-maven-args }} --quiet '-Doutput=releaseNumberSDK-value.txt'
105+
mvn help:evaluate -Dexpression=releaseNumberSDK ${{ inputs.extra-maven-args }} --quiet '-Doutput=releaseNumberSDK-value.txt' \
106+
${{ inputs.without-EF-infra && '-Dtycho.version=4.0.12' || '' }}
83107
streamVersion=$(<releaseNumberSDK-value.txt)
84108
rm -f releaseNumberSDK-value.txt
85109
popd

.github/workflows/codeQLworkflow.yml

Lines changed: 29 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: 'Weather 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,35 @@ jobs:
7782
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
7883
with:
7984
maven-version: ${{ inputs.mavenVersion }}
85+
86+
- name: Checkout eclipse.platform.releng.aggregator
87+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
88+
if : inputs.without-EF-infra
89+
with:
90+
repository: eclipse-platform/eclipse.platform.releng.aggregator
91+
path: eclipse.platform.releng.aggregator
92+
sparse-checkout: |
93+
eclipse-platform-parent
94+
eclipse.platform.releng.prereqs.sdk
95+
- name: Install eclipse-parent poms
96+
if : inputs.without-EF-infra
97+
working-directory: eclipse.platform.releng.aggregator
98+
run: |
99+
cd eclipse-platform-parent
100+
mvn clean install -B -ntp '-Dtycho.version=4.0.12'
101+
cd ..
102+
cd eclipse.platform.releng.prereqs.sdk
103+
mvn clean install -B -ntp '-Dtycho.version=4.0.12'
104+
- name: Remove eclipse.platform.releng.aggregator
105+
if : inputs.without-EF-infra
106+
run: ${{ matrix.config.name == 'Windows' && 'rmdir -r -Force' || 'rm -rf' }} eclipse.platform.releng.aggregator
107+
80108
- name: Build with Maven
81109
uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
82110
with:
83111
run: >-
84112
mvn --batch-mode -V -U
113+
${{ inputs.without-EF-infra && '-Dtycho.version=4.0.12' || '' }}
85114
-ntp
86115
-Dcompare-version-with-baselines.skip=true
87116
-Pbree-libs

.github/workflows/mavenBuild.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424
description: 'Weather to run this build without the need for EF-infrastructure (which is currently unavailable).'
2525
type: boolean
2626
required: false
27-
default: false
27+
default: true
2828

2929
permissions: {}
3030

@@ -69,6 +69,10 @@ jobs:
6969
JavaSE-21
7070
distribution: 'temurin'
7171
cache: maven
72+
- name: Set up Maven
73+
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
74+
with:
75+
maven-version: ${{ inputs.mavenVersion }}
7276

7377
- name: Checkout eclipse.platform.releng.aggregator
7478
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -92,10 +96,6 @@ jobs:
9296
if : inputs.without-EF-infra
9397
run: ${{ matrix.config.name == 'Windows' && 'rmdir -r -Force' || 'rm -rf' }} eclipse.platform.releng.aggregator
9498

95-
- name: Set up Maven
96-
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
97-
with:
98-
maven-version: ${{ inputs.mavenVersion }}
9999
- name: Download the API Tools matcher
100100
uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9 # v1.6.0
101101
id: api-tools-matcher

0 commit comments

Comments
 (0)