Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ frontend:
- any-glob-to-any-file:
- 'frontend/**'

backend:
common:
- changed-files:
- any-glob-to-any-file:
- 'core/**'
- 'common/**'

service:
- changed-files:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/github-action-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
uses: sbt/setup-sbt@v1
- uses: coursier/cache-action@v6
with:
extraSbtFiles: '["core/*.sbt", "core/project/**.{scala,sbt}", "core/project/build.properties" ]'
extraSbtFiles: '["*.sbt", "project/**.{scala,sbt}", "project/build.properties" ]'
- name: Lint with scalafmt
run: sbt scalafmtCheckAll
- name: Create Databases
Expand Down
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
// specific language governing permissions and limitations
// under the License.

lazy val DAO = project in file("core/dao")
lazy val Config = project in file("core/config")
lazy val Auth = (project in file("core/auth"))
lazy val DAO = project in file("common/dao")
lazy val Config = project in file("common/config")
lazy val Auth = (project in file("common/auth"))
.dependsOn(DAO, Config)
lazy val ConfigService = (project in file("config-service"))
.dependsOn(Auth, Config)
Expand All @@ -37,7 +37,7 @@ lazy val AccessControlService = (project in file("access-control-service"))
)
.configs(Test)
.dependsOn(DAO % "test->test", Auth % "test->test")
lazy val WorkflowCore = (project in file("core/workflow-core"))
lazy val WorkflowCore = (project in file("common/workflow-core"))
.dependsOn(DAO, Config)
.configs(Test)
.dependsOn(DAO % "test->test") // test scope dependency
Expand All @@ -62,7 +62,7 @@ lazy val FileService = (project in file("file-service"))
)
)

lazy val WorkflowOperator = (project in file("core/workflow-operator")).dependsOn(WorkflowCore)
lazy val WorkflowOperator = (project in file("common/workflow-operator")).dependsOn(WorkflowCore)
lazy val WorkflowCompilingService = (project in file("workflow-compiling-service"))
.dependsOn(WorkflowOperator, Config)
.settings(
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<packageName>org.apache.texera.dao.jooq.generated</packageName>

<!-- The destination directory of your generated classes. Using Maven directory layout here -->
<directory>core/dao/src/main/scala</directory>
<directory>common/dao/src/main/scala</directory>
</target>
</generator>
</configuration>
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class FileResolverSpec
datasetVersion
}

private val localCsvFilePath = "core/workflow-core/src/test/resources/country_sales_small.csv"
private val localCsvFilePath = "common/workflow-core/src/test/resources/country_sales_small.csv"

private val datasetACsvFilePath = "/test_user@test.com/test_dataset/v2/directory/a.csv"

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ object TestOperators {

val parentDir = Path
.of(sys.env.getOrElse("TEXERA_HOME", "."))
.resolve("core/workflow-operator")
.resolve("common")
.resolve("workflow-operator")
.toRealPath()
.toString
val CountrySalesSmallCsvPath = s"$parentDir/src/test/resources/country_sales_small.csv"
Expand Down
Loading
Loading