Skip to content

ci: build master changes through a merge queue #1560

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

Open
joaodinissf wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −1
Open

ci: build master changes through a merge queue #1560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions .github/workflows/snapshot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,12 @@ jobs:
run: rm -rf ~/.m2/repository/.cache/tycho/https/dsldevkit.github.io ~/.m2/repository/.cache/tycho/https/ddk.tools.avaloq.com

- name: Build p2 update site
# Fail rather than swap in a published artifact of the same version with different content.
run: |
xvfb-run mvn clean verify \
checkstyle:check pmd:pmd pmd:cpd pmd:check pmd:cpd-check spotbugs:check \
-f ./ddk-parent/pom.xml \
-Dtycho.baseline=failCommon \
--batch-mode --fail-at-end

- name: Fail on missing surefire reports
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/verify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: verify
on:
pull_request:
merge_group:
jobs:
pmd:
runs-on: ubuntu-24.04
Expand Down Expand Up @@ -76,7 +77,10 @@ jobs:
- name: Build with Maven within a virtual X Server Environment
# Run pmd:pmd and pmd:cpd first to generate reports for all modules, then run pmd:check and pmd:cpd-check
# This ensures all violations are collected and reported before the build fails
run: xvfb-run mvn clean verify checkstyle:check pmd:pmd pmd:cpd pmd:check pmd:cpd-check spotbugs:check -f ./ddk-parent/pom.xml --batch-mode --fail-at-end
# PR builds ignore the published snapshot; merge-queue builds use it exactly as the snapshot build does.
env:
BASELINE_ARGS: ${{ github.event_name == 'merge_group' && '-Dtycho.baseline=failCommon' || '-Dtycho.baseline=disable -Dtycho.baseline.replace=none' }}
run: xvfb-run mvn clean verify checkstyle:check pmd:pmd pmd:cpd pmd:check pmd:cpd-check spotbugs:check -f ./ddk-parent/pom.xml --batch-mode --fail-at-end $BASELINE_ARGS
- name: Fail on missing surefire reports
if: always()
run: bash .github/scripts/check-surefire-reports.sh
Expand Down