Skip to content

Commit ed6f684

Browse files
committed
[FIXUP] part 3
1 parent 1400438 commit ed6f684

File tree

4 files changed

+43
-57
lines changed

4 files changed

+43
-57
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: 8 additions & 19 deletions
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: 'Weather 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,27 +56,11 @@ jobs:
5156
with:
5257
maven-version: 3.9.9
5358

54-
- name: Checkout eclipse.platform.releng.aggregator
55-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
59+
- name: Install Maven parent locally
60+
uses: HannesWell/eclipse.platform.releng.aggregator/.github/actions/install-maven-parent-action@gh-workflow-quickfix
5661
if : inputs.without-EF-infra
5762
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'
63+
tycho-version: 4.0.12
7564

7665
- name: Additional setup
7766
if: inputs.extra-setup-command

.github/workflows/codeQLworkflow.yml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -83,27 +83,11 @@ jobs:
8383
with:
8484
maven-version: ${{ inputs.mavenVersion }}
8585

86-
- name: Checkout eclipse.platform.releng.aggregator
87-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
86+
- name: Install Maven parent locally
87+
uses: HannesWell/eclipse.platform.releng.aggregator/.github/actions/install-maven-parent-action@gh-workflow-quickfix
8888
if : inputs.without-EF-infra
8989
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
90+
tycho-version: 4.0.12
10791

10892
- name: Build with Maven
10993
uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a

.github/workflows/mavenBuild.yml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -74,27 +74,11 @@ jobs:
7474
with:
7575
maven-version: ${{ inputs.mavenVersion }}
7676

77-
- name: Checkout eclipse.platform.releng.aggregator
78-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
77+
- name: Install Maven parent locally
78+
uses: HannesWell/eclipse.platform.releng.aggregator/.github/actions/install-maven-parent-action@gh-workflow-quickfix
7979
if : inputs.without-EF-infra
8080
with:
81-
repository: eclipse-platform/eclipse.platform.releng.aggregator
82-
path: eclipse.platform.releng.aggregator
83-
sparse-checkout: |
84-
eclipse-platform-parent
85-
eclipse.platform.releng.prereqs.sdk
86-
- name: Install eclipse-parent poms
87-
if : inputs.without-EF-infra
88-
working-directory: eclipse.platform.releng.aggregator
89-
run: |
90-
cd eclipse-platform-parent
91-
mvn clean install -B -ntp '-Dtycho.version=4.0.12'
92-
cd ..
93-
cd eclipse.platform.releng.prereqs.sdk
94-
mvn clean install -B -ntp '-Dtycho.version=4.0.12'
95-
- name: Remove eclipse.platform.releng.aggregator
96-
if : inputs.without-EF-infra
97-
run: ${{ matrix.config.name == 'Windows' && 'rmdir -r -Force' || 'rm -rf' }} eclipse.platform.releng.aggregator
81+
tycho-version: 4.0.12
9882

9983
- name: Download the API Tools matcher
10084
uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9 # v1.6.0

0 commit comments

Comments
 (0)