Skip to content

Commit dc92085

Browse files
committed
[Build] Simplify download of API Tools matcher in shared GH workflow
Makes it more compact and only relays on tools provided by the runner. Additionally adapt the defined 'api-problems' problem-matcher to the new console printout.
1 parent 43aa703 commit dc92085

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.github/matcher/api-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"owner": "api-problems",
55
"pattern": [
66
{
7-
"regexp": "^\\[API\\s(\\w+)\\].*line\\s(\\d+):\\s(.+)\\(location:\\s(.+)\\)$",
7+
"regexp": "\\[API (ERROR|WARNING)\\].* at line (\\d+):\\s(.+)\\(location:\\s(.+)\\)$",
88
"severity": 1,
99
"line": 2,
1010
"message": 3,

.github/workflows/mavenBuild.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,10 @@ jobs:
8585
tycho-version: 4.0.12
8686

8787
- name: Download the API Tools matcher
88-
uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9 # v1.6.0
89-
id: api-tools-matcher
90-
with:
91-
url: "https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.releng.aggregator/master/.github/matcher/api-tools.json"
92-
target: .github/matcher
93-
- run: echo "::add-matcher::.github/matcher/${{ steps.api-tools-matcher.outputs.filename }}"
88+
run: |
89+
mkdir .github/matcher
90+
curl -o .github/matcher/api-tools.json https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.releng.aggregator/master/.github/matcher/api-tools.json
91+
echo "::add-matcher::.github/matcher/api-tools.json"
9492
- name: Build with Maven
9593
run: >-
9694
${{ runner.os == 'Linux' && 'xvfb-run' || '' }}

0 commit comments

Comments
 (0)