Skip to content

Commit cf39c9e

Browse files
committed
use envvar and released versions for maven projects
1 parent ebfc700 commit cf39c9e

File tree

3 files changed

+30
-2
lines changed

3 files changed

+30
-2
lines changed

graalpython/com.oracle.graal.python.test.integration/pom.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Additionally, one can change the polyglot artifacts version with
6464
<maven.compiler.source>17</maven.compiler.source>
6565
<maven.compiler.target>17</maven.compiler.target>
6666
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
67-
<com.oracle.graal.python.test.polyglot.version>24.1.0</com.oracle.graal.python.test.polyglot.version>
67+
<com.oracle.graal.python.test.polyglot.version>24.0.0</com.oracle.graal.python.test.polyglot.version>
6868
</properties>
6969

7070
<build>
@@ -99,6 +99,17 @@ Additionally, one can change the polyglot artifacts version with
9999
</build>
100100

101101
<profiles>
102+
<profile>
103+
<id>Version from suite</id>
104+
<activation>
105+
<property>
106+
<name>env.GRAALPY_VERSION</name>
107+
</property>
108+
</activation>
109+
<properties>
110+
<com.oracle.graal.python.test.polyglot.version>${env.GRAALPY_VERSION}</com.oracle.graal.python.test.polyglot.version>
111+
</properties>
112+
</profile>
102113
<profile>
103114
<id>Custom central repo</id>
104115
<activation>

graalpython/graalpy-maven-plugin/pom.xml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,23 @@ SOFTWARE.
5656
<maven.compiler.target>17</maven.compiler.target>
5757
<maven.compiler.source>17</maven.compiler.source>
5858
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
59-
<graalpy.version>24.1.0</graalpy.version>
59+
<graalpy.version>24.0.0</graalpy.version>
6060
</properties>
6161

62+
<profiles>
63+
<profile>
64+
<id>Version from suite</id>
65+
<activation>
66+
<property>
67+
<name>env.GRAALPY_VERSION</name>
68+
</property>
69+
</activation>
70+
<properties>
71+
<graalpy.version>${env.GRAALPY_VERSION}</graalpy.version>
72+
</properties>
73+
</profile>
74+
</profiles>
75+
6276
<build>
6377
<plugins>
6478
<plugin>

mx.graalpython/mx_graalpython.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@ def get_boolean_env(name, default=False):
104104
PYTHON_VERSION = SUITE.suiteDict[f'{SUITE.name}:pythonVersion']
105105
PYTHON_VERSION_MAJ_MIN = ".".join(PYTHON_VERSION.split('.')[:2])
106106

107+
# this environment variable is used by some of our maven projects and jbang integration to build against the unreleased master version during development
108+
os.environ["GRAALPY_VERSION"] = GRAAL_VERSION
109+
107110
MAIN_BRANCH = 'master'
108111
HPY_IMPORT_ORPHAN_BRANCH_NAME = "hpy-import"
109112

0 commit comments

Comments
 (0)