Skip to content

Commit

Permalink
move mill modules into subdirectory
Browse files Browse the repository at this point in the history
  • Loading branch information
patrick-schultz committed Dec 18, 2024
1 parent a535fcb commit a40fa7d
Show file tree
Hide file tree
Showing 4,377 changed files with 13 additions and 10 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
20 changes: 10 additions & 10 deletions build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@ steps:
cd /io/repo/hail
time tar czf test.tar.gz -C python test pytest.ini
time tar czf resources.tar.gz -C src/test resources
time tar czf resources.tar.gz -C modules/src/test resources
time tar czf data.tar.gz -C python/hail/docs data
time TESTNG_SPLITS=5 python3 generate_splits.py
time tar czf splits.tar.gz testng-splits-*.xml
Expand Down Expand Up @@ -965,7 +965,7 @@ steps:
export GOOGLE_APPLICATION_CREDENTIALS=/test-gsa-key/key.json
export AZURE_APPLICATION_CREDENTIALS=/test-gsa-key/key.json
python3 -m hailtop.aiotools.copy 'null' '[
{"from": "src/test/resources",
{"from": "modules/src/test/resources",
"to": "{{ global.test_storage_uri }}/{{ token }}/test/resources"},
{"from": "python/hail/docs/data",
"to": "{{ global.test_storage_uri }}/{{ token }}/doctest/data"}
Expand All @@ -976,8 +976,8 @@ steps:
valueFrom: default_ns.name
mountPath: /test-gsa-key
inputs:
- from: /repo/hail/src/test/resources
to: /io/repo/hail/src/test/resources
- from: /repo/hail/modules/src/test/resources
to: /io/repo/hail/modules/src/test/resources
- from: /repo/hail/python/hail/docs/data
to: /io/repo/hail/python/hail/docs/data
dependsOn:
Expand All @@ -996,8 +996,8 @@ steps:
script: |
set -ex
cd /io
mkdir -p src/test
tar xzf resources.tar.gz -C src/test
mkdir -p modules/src/test
tar xzf resources.tar.gz -C modules/src/test
tar xzf splits.tar.gz
export HAIL_TEST_SKIP_R=1
java -cp hail-test.jar:$SPARK_HOME/jars/* org.testng.TestNG -listener is.hail.LogTestListener testng-splits-$HAIL_RUN_IMAGE_SPLIT_INDEX.xml
Expand Down Expand Up @@ -3636,8 +3636,8 @@ steps:
script: |
set -ex
cd /io
mkdir -p src/test
tar xzf resources.tar.gz -C src/test
mkdir -p modules/src/test
tar xzf resources.tar.gz -C modules/src/test
export HAIL_CLOUD={{ global.cloud }}
export HAIL_DEFAULT_NAMESPACE={{ default_ns.name }}
Expand Down Expand Up @@ -3696,8 +3696,8 @@ steps:
export HAIL_DEFAULT_NAMESPACE={{ default_ns.name }}
cd /io
mkdir -p src/test
tar xzf resources.tar.gz -C src/test
mkdir -p modules/src/test
tar xzf resources.tar.gz -C modules/src/test
java -Xms7500M -Xmx7500M \
-cp hail-test.jar:$SPARK_HOME/jars/* \
org.testng.TestNG \
Expand Down
3 changes: 3 additions & 0 deletions hail/build.mill
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import mill.scalalib.Assembly._
import mill.scalalib.TestModule.TestNg
import mill.scalalib.scalafmt.ScalafmtModule
import mill.util.Jvm
import os.Path

object Settings {
val hailMajorMinorVersion = "0.2"
Expand Down Expand Up @@ -126,6 +127,8 @@ trait HailScalaModule extends SbtModule with ScalafmtModule with ScalafixModule

object `package` extends RootModule with HailScalaModule { outer =>

override def millSourcePath: Path = super.millSourcePath / "modules"

object env extends Module {
def scalaVersion: T[String] = Task.Input {
val v = T.ctx().env.getOrElse("SCALA_VERSION", "2.12.20")
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit a40fa7d

Please sign in to comment.