Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: upgrade to Maven 3.9.7 ad improve license check #1027

Merged
merged 2 commits into from
Jun 11, 2024
Merged

ci: upgrade to Maven 3.9.7 ad improve license check #1027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a996d4
ci: improve license check
sebthom Jun 11, 2024
b34fed9
ci: upgrade to Maven 3.9.7
sebthom Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ jobs:
- name: "Install: Maven"
uses: stCarolas/setup-maven@v5 # https://github.com/stCarolas/setup-maven
with:
maven-version: 3.9.6
maven-version: 3.9.7


- name: "Build with Maven 🔨"
Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/licensecheck.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
- name: "Install: Maven"
uses: stCarolas/setup-maven@v5 # https://github.com/stCarolas/setup-maven
with:
maven-version: 3.9.6
maven-version: 3.9.7


- name: Dash License check # see https://github.com/eclipse/dash-licenses
Expand All @@ -103,9 +103,13 @@ jobs:
echo "MAVEN_OPTS: $MAVEN_OPTS"

if [[ ${ACT:-} == "true" ]]; then # when running locally using nektos/act
maven_args="-Djgit.dirtyWorkingTree=warning"
maven_args="-Djgit.dirtyWorkingTree=warning"
else
maven_args="--no-transfer-progress"
maven_args="--no-transfer-progress"
fi

if [[ -n $DASH_IPLAB_TOKEN ]]; then
dash_iplab_token_arg="-Ddash.iplab.token=$DASH_IPLAB_TOKEN"
fi

# "excludeArtifactIds" parameter is to prevent builds from failing with:
Expand All @@ -115,7 +119,7 @@ jobs:
# This content is either not correctly mapped by the system, or requires review.
# Error: Dependency license check failed. Some dependencies need to be vetted.

mvn \
(set -x; mvn \
--errors \
--update-snapshots \
--batch-mode \
Expand All @@ -125,12 +129,12 @@ jobs:
org.eclipse.dash:license-tool-plugin:license-check \
-Dtycho.target.eager=true \
-Ddash.projectId=technology.lsp4e \
-Ddash.iplab.token="$DASH_IPLAB_TOKEN" \
${dash_iplab_token_arg:-} \
-Ddash.fail=true \
-Ddash.summary=DEPENDENCIES \
-DexcludeArtifactIds=\
org.eclipse.rcp_root,\
org.eclipse.ui.tests.harness
org.eclipse.ui.tests.harness)


- name: Dash Summary
Expand Down
Loading