Skip to content

Commit fddd5ef

Browse files
committed
Merge branch 'ST6RI-178' into ST6RI-836
2 parents 8f6cb35 + 97c6ead commit fddd5ef

103 files changed

Lines changed: 38870 additions & 35214 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
2+
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
3+
4+
# This workflow uses actions that are not certified by GitHub.
5+
# They are provided by a third-party and are governed by
6+
# separate terms of service, privacy policy, and support
7+
# documentation.
8+
9+
name: Java CI with Maven
10+
11+
on:
12+
push:
13+
branches: [ "master" ]
14+
pull_request:
15+
branches: '**'
16+
17+
jobs:
18+
build:
19+
20+
runs-on: ubuntu-latest
21+
22+
steps:
23+
- uses: actions/checkout@v4
24+
- name: Set up JDK 17
25+
uses: actions/setup-java@v4
26+
with:
27+
java-version: '17'
28+
distribution: 'temurin'
29+
cache: maven
30+
- name: Build with Maven
31+
run: ./mvnw -B clean verify --file pom.xml
32+
- name: Publish Test Report
33+
uses: mikepenz/action-junit-report@v5
34+
if: success() || failure() # always run even if the previous step fails
35+
with:
36+
report_paths: '**/target/surefire-reports/TEST-*.xml'
37+
include_passed: true
38+
- name: Verify index generation
39+
run: echo $(git diff -- sysml.library/.index.json) | grep -e '^$' || (echo "Library index in the git repository is not up to date. Please re-generate it and push changes to the repository."; exit 1)
40+
- name: Publish to Github Packages
41+
if: github.event_name != 'pull_request'
42+
run: ./mvnw -B deploy -DskipTests=true
43+
env:
44+
GITHUB_TOKEN: ${{ github.token }} # GITHUB_TOKEN is the default env for the password

org.omg.kerml.xtext.ui/META-INF/MANIFEST.MF

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ Require-Bundle: org.omg.kerml.xtext,
2222
org.omg.kerml.expressions.xtext;bundle-version="0.9.0",
2323
org.omg.kerml.expressions.xtext.ide;bundle-version="0.9.0",
2424
org.omg.kerml.expressions.xtext.ui;bundle-version="0.9.0",
25-
org.eclipse.xtext.common.types.ui
25+
org.eclipse.xtext.common.types.ui,
26+
org.eclipse.emf.ecore.editor
2627
Import-Package: org.apache.log4j
2728
Export-Package: org.omg.kerml.xtext.ui,
2829
org.omg.kerml.xtext.ui.internal,
2930
org.omg.kerml.xtext.ui.labeling,
3031
org.omg.kerml.xtext.ui.library,
3132
org.omg.kerml.xtext.ui.outline,
3233
org.omg.kerml.xtext.ui.quickfix
33-
Bundle-Activator: org.omg.kerml.xtext.ui.internal.XtextActivator
34+
Bundle-Activator: org.omg.kerml.xtext.ui.KerMLActivator

0 commit comments

Comments
 (0)