Skip to content

Commit 06f1d1d

Browse files
committed
Add a manifest cleanup profile and workflow option
1 parent e0b95fc commit 06f1d1d

File tree

3 files changed

+23
-6
lines changed

3 files changed

+23
-6
lines changed

.github/workflows/README.MD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ It checks all artifacts that match the provided range and suggest a lower bound
3636

3737
Workflow that could be used as a timed action to check if any automatic code cleanup can be performed.
3838
Actions to perform must be defined in the configuration of the [quickfix-and-cleanup-mojo](https://github.com/eclipse-tycho/tycho/blob/main/RELEASE_NOTES.md#new-quickfix-and-cleanup-mojo)
39-
that is called by this action. For this purpose it uses the follwoing execution ids `cleanups` and `quickfixes`
39+
that is called by this action. For this purpose it uses the follwoing execution ids `cleanups`, `quickfixes` and `manifest`.
4040

4141
## updateTarget.yml
4242

.github/workflows/cleanCode.yml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,18 @@ on:
1414
do-cleanups:
1515
description: Configures if cleanup actions should be performed
1616
required: false
17-
default: true
17+
default: false
1818
type: boolean
1919
do-quickfix:
2020
description: Configures if quickfix actions should be performed
2121
required: false
22-
default: true
22+
default: false
2323
type: boolean
24+
do-manifest:
25+
description: Configures if organize manifest actions should be performed
26+
required: false
27+
default: false
28+
type: boolean
2429
submodules:
2530
description: |
2631
Whether to checkout submodules: `true` to checkout submodules or `recursive` to recursively checkout submodules.
@@ -112,15 +117,20 @@ jobs:
112117
working-directory: ${{ matrix.bundles }}
113118
if: ${{ inputs.do-cleanups && fromJson(steps.list-prs.outputs.prs)[9] == null }}
114119
run: >-
115-
xvfb-run mvn -B -ntp tycho-cleancode:cleanup@cleanups
120+
xvfb-run mvn -U -B -ntp tycho-cleancode:cleanup@cleanups
116121
- name: Perform QuickFixes on ${{ matrix.bundles }}
117122
working-directory: ${{ matrix.bundles }}
118123
if: ${{ inputs.do-quickfix && fromJson(steps.list-prs.outputs.prs)[9] == null }}
119124
run: >-
120-
xvfb-run mvn -B -ntp -e tycho-cleancode:quickfix@quickfixes
125+
xvfb-run mvn -U -B -ntp -e tycho-cleancode:quickfix@quickfixes
126+
- name: Perform Organize Manifest on ${{ matrix.bundles }}
127+
working-directory: ${{ matrix.bundles }}
128+
if: ${{ inputs.do-manifest && fromJson(steps.list-prs.outputs.prs)[9] == null }}
129+
run: >-
130+
xvfb-run mvn -U -B -ntp -e tycho-cleancode:manifest@manifest
121131
- name: Create final PR description
122132
working-directory: ${{ matrix.bundles }}/target
123-
if: ${{ hashFiles(format('{0}/target/quickfix.md', matrix.bundles)) != '' || hashFiles(format('{0}/target/cleanups.md', matrix.bundles)) != '' }}
133+
if: ${{ hashFiles(format('{0}/target/quickfix.md', matrix.bundles)) != '' || hashFiles(format('{0}/target/cleanups.md', matrix.bundles)) != '' || hashFiles(format('{0}/target/organizeManifest.md', matrix.bundles)) != '' }}
124134
run: >-
125135
cat *.md > pr.md
126136
- name: Create Pull Request
@@ -139,3 +149,4 @@ jobs:
139149
author: ${{ inputs.author }}
140150
add-paths: |
141151
**/*.java
152+
**/*.MF

eclipse-platform-parent/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -617,6 +617,12 @@
617617
</quickfixes>
618618
</configuration>
619619
</execution>
620+
<execution>
621+
<id>manifest</id>
622+
<configuration>
623+
<calculateUses>true</calculateUses>
624+
</configuration>
625+
</execution>
620626
</executions>
621627
<configuration>
622628
<local>true</local>

0 commit comments

Comments
 (0)