Skip to content

Commit 4e13fd6

Browse files
committed
Fix Java version to 17 and correct P build directory path
1 parent 92b27f3 commit 4e13fd6

File tree

4 files changed

+22
-25
lines changed

4 files changed

+22
-25
lines changed

.github/workflows/pex.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ jobs:
3232
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
3333
restore-keys: ${{ runner.os }}-m2
3434
- name: Build PEx
35-
working-directory: Src/PRuntimes/PExRuntime
36-
run: ./scripts/build.sh
35+
working-directory: Src/PEx
36+
run: ./scripts/build_and_test.sh --build
3737
- name: Test PEx
38-
working-directory: Src/PRuntimes/PExRuntime
39-
run: mvn test
38+
working-directory: Src/PEx
39+
run: ./scripts/build_and_test.sh --test

Src/PEx/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@
142142
<version>1.18.36</version>
143143
</path>
144144
</annotationProcessorPaths>
145-
<source>16</source>
146-
<target>16</target>
145+
<source>17</source>
146+
<target>17</target>
147147
</configuration>
148148
</plugin>
149149
<plugin>
@@ -278,7 +278,7 @@
278278
</distributionManagement>
279279

280280
<properties>
281-
<java.version>11</java.version>
281+
<java.version>17</java.version>
282282
<maven.compiler.source>${java.version}</maven.compiler.source>
283283
<maven.compiler.target>${java.version}</maven.compiler.target>
284284
<log4j2.configurationFile>${project.basedir}/src/main/resources/log4j2.xml</log4j2.configurationFile>

Src/PEx/scripts/README.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@
22

33
This directory contains scripts for building and testing the PEx project.
44

5+
## Java Requirements
6+
7+
The PEx project requires Java 17 to build and run. If you have multiple Java versions installed on your system, make sure to use Java 17 when building the project.
8+
9+
To use Java 17 for building the project:
10+
11+
```bash
12+
# If using Homebrew Java 17 on macOS
13+
export JAVA_HOME="/opt/homebrew/Cellar/openjdk@17/17.0.15/libexec/openjdk.jdk/Contents/Home"
14+
export PATH="$JAVA_HOME/bin:$PATH"
15+
16+
# Then run the build script
17+
scripts/build_and_test.sh [options]
18+
```
19+
520
## Available Scripts
621

722
### build.sh

Src/PEx/scripts/build.sh

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)