Skip to content

Commit

Permalink
Merge branch 'master' into maintenance/FELIX-6746-websocketservlet-in…
Browse files Browse the repository at this point in the history
…it-NPE
  • Loading branch information
paulrutter committed Jan 4, 2025
2 parents a05cdb0 + f572bd8 commit 3c33138
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 82 deletions.
40 changes: 0 additions & 40 deletions .github/workflows/ci-http.yml

This file was deleted.

40 changes: 0 additions & 40 deletions .github/workflows/ci-scr.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
name: Github CI Build - Maven bundle plugin
name: Github CI Build

on:
push:
branches: [ "master" ]
paths:
- 'scr/**'
- 'http/**'
- 'tools/maven-bundle-plugin/**'
pull_request:
branches: [ "master" ]
paths:
- 'scr/**'
- 'http/**'
- 'tools/maven-bundle-plugin/**'

permissions: {}
Expand All @@ -27,7 +31,26 @@ jobs:
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
with:
maven-version: 3.9.7
- name: Felix maven-bundle-plugin
- name: Check which subproject changed and build affected ones
uses: dorny/paths-filter@v3
id: changes
with:
filters: |
scr:
- 'scr/**'
http:
- 'http/**'
maven-bundle-plugin:
- 'tools/maven-bundle-plugin/**'
- name: Felix SCR
if: steps.changes.outputs.scr == 'true'
run: mvn -B -V -Dstyle.color=always --file scr/pom.xml clean verify
- name: Felix HTTP
if: steps.changes.outputs.http == 'true'
run: mvn -B -V -Dstyle.color=always "-Dit.test=!MissingWebsocketDependenciesIT" --file http/pom.xml clean install verify
- name: Felix Maven bundle plugin
if: steps.changes.outputs.maven-bundle-plugin == 'true'
run: mvn -B -V -Dstyle.color=always --file tools/maven-bundle-plugin/pom.xml clean install verify
- name: Upload Test Results
if: always()
Expand Down

0 comments on commit 3c33138

Please sign in to comment.