Skip to content

Commit f72fbb5

Browse files
author
Dennis Labordus
authored
Merge branch 'develop' into dependabot/maven/org.apache.maven.plugins-maven-resources-plugin-3.3.0
2 parents 01527bc + 624be98 commit f72fbb5

File tree

4 files changed

+22
-2
lines changed

4 files changed

+22
-2
lines changed

.github/workflows/build-project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
build:
1818
name: Build
1919
runs-on: ubuntu-latest
20-
timeout-minutes: 15
20+
timeout-minutes: 30
2121

2222
steps:
2323
- name: Checkout

.github/workflows/release-project.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
push_to_registry:
1313
name: Build and publish
1414
runs-on: ubuntu-latest
15+
timeout-minutes: 30
1516

1617
steps:
1718
- name: Checkout

.github/workflows/sonarcloud-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
build:
2222
name: SonarCloud
2323
runs-on: ubuntu-latest
24-
timeout-minutes: 15
24+
timeout-minutes: 30
2525

2626
if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }}
2727
steps:

DEVELOPMENT.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ SPDX-License-Identifier: Apache-2.0
66

77
# Development for CoMPAS SCL Validator
88

9+
10+
---
11+
**Note**
12+
Mac M1 chip users, see [below](#mac-m1)
13+
14+
---
15+
16+
917
Since version 1.2.x the JAR Files of RiseClipse are distributed through Maven Central Repository. The JAR Files can be
1018
retrieved from there and don't need to be build locally anymore. Only the OCL Files for the SCL validation still need to
1119
be downloaded from RiseClipse GIT Repository. This is still done using Git Submodules.
@@ -159,3 +167,14 @@ with JVM executable using:
159167
```shell script
160168
./mvnw package -Pjvm-image
161169
```
170+
171+
## Mac M1
172+
173+
The Mac M1 chip is ARM based. In order to make this project work, you need to install the x86 version of your IDE.
174+
You also need Rosetta2 to virtualize your os. In the x86 version of your IDE, you also need to install the x86 Java version.
175+
You can use SDK-Man to easily switch between java versions.
176+
177+
While calling maven scripts, you need to add the os.arch flag.
178+
```shell script
179+
./mvnw clean compile -Dos.arch=x86_64
180+
```

0 commit comments

Comments
 (0)