Skip to content

Fix CI/CD pipeline issue #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qiaoyuang merged 2 commits into from
Oct 24, 2025
Merged

Fix CI/CD pipeline issue #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34459bf
Delete redundant code
qiaoyuang Oct 24, 2025
39cac9c
Fix the CI/CD pipeline failure on Linux
qiaoyuang Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ kotlin.code.style=official
kotlin.mpp.stability.nowarn=true
kotlin.mpp.enableCInteropCommonization=true
kotlin.native.increment=true
kotlin.native.ignoreDisabledTargets=true
kotlin.jvm.target.validation.mode=warning
kotlin.native.binary.pagedAllocator=false
kotlin.native.binary.latin1Strings=true
Expand Down
12 changes: 6 additions & 6 deletions sqllin-driver/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ gradle.taskGraph.whenReady {
return@whenReady
tasks.forEach {
when {
it.name.contains("linux", true) -> {
it.enabled = HostManager.hostIsLinux
}
it.name.contains("mingw", true) -> {
it.enabled = HostManager.hostIsMingw
}
it.name.contains("linux", true) -> it.enabled = HostManager.hostIsLinux
it.name.contains("mingw", true) -> it.enabled = HostManager.hostIsMingw
it.name.contains("ios", true)
|| it.name.contains("macos", true)
|| it.name.contains("watchos", true)
|| it.name.contains("tvos", true) -> it.enabled = HostManager.hostIsMac
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions sqllin-driver/src/androidMain/AndroidManifest.xml
View file
Open in desktop

This file was deleted.

40 changes: 6 additions & 34 deletions sqllin-dsl/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,34 +63,6 @@ kotlin {
implementation(libs.kotlinx.serialization)
implementation(libs.kotlinx.coroutines.core)
}
val jvmAndNativeMain by creating {
dependsOn(commonMain.get())
}

jvmMain { dependsOn(jvmAndNativeMain) }

// Configure all native targets to depend on jvmAndNativeMain
iosX64Main { dependsOn(jvmAndNativeMain) }
iosArm64Main { dependsOn(jvmAndNativeMain) }
iosSimulatorArm64Main { dependsOn(jvmAndNativeMain) }

macosX64Main { dependsOn(jvmAndNativeMain) }
macosArm64Main { dependsOn(jvmAndNativeMain) }

watchosArm32Main { dependsOn(jvmAndNativeMain) }
watchosArm64Main { dependsOn(jvmAndNativeMain) }
watchosX64Main { dependsOn(jvmAndNativeMain) }
watchosSimulatorArm64Main { dependsOn(jvmAndNativeMain) }
watchosDeviceArm64Main { dependsOn(jvmAndNativeMain) }

tvosArm64Main { dependsOn(jvmAndNativeMain) }
tvosX64Main { dependsOn(jvmAndNativeMain) }
tvosSimulatorArm64Main { dependsOn(jvmAndNativeMain) }

linuxX64Main { dependsOn(jvmAndNativeMain) }
linuxArm64Main { dependsOn(jvmAndNativeMain) }

mingwX64Main { dependsOn(jvmAndNativeMain) }
}
}

Expand All @@ -99,12 +71,12 @@ gradle.taskGraph.whenReady {
return@whenReady
tasks.forEach {
when {
it.name.contains("linux", true) -> {
it.enabled = HostManager.hostIsLinux
}
it.name.contains("mingw", true) -> {
it.enabled = HostManager.hostIsMingw
}
it.name.contains("linux", true) -> it.enabled = HostManager.hostIsLinux
it.name.contains("mingw", true) -> it.enabled = HostManager.hostIsMingw
it.name.contains("ios", true)
|| it.name.contains("macos", true)
|| it.name.contains("watchos", true)
|| it.name.contains("tvos", true) -> it.enabled = HostManager.hostIsMac
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions sqllin-dsl/src/androidMain/AndroidManifest.xml
View file
Open in desktop

This file was deleted.

87 changes: 0 additions & 87 deletions sqllin-dsl/src/androidMain/kotlin/com/ctrip/sqllin/dsl/sql/clause/AndroidClauseBlob.kt
View file
Open in desktop

This file was deleted.

20 changes: 7 additions & 13 deletions sqllin-dsl/src/commonMain/kotlin/com/ctrip/sqllin/dsl/sql/clause/ClauseBlob.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import com.ctrip.sqllin.dsl.sql.Table
*
* @author Yuang Qiao
*/
public open class DefaultClauseBlob internal constructor(
public class ClauseBlob(
valueName: String,
table: Table<*>,
isFunction: Boolean,
Expand All @@ -58,7 +58,7 @@ public open class DefaultClauseBlob internal constructor(
* @param clauseBlob The BLOB column/function to compare against
* @return Condition expression comparing two BLOB columns
*/
internal infix fun eq(clauseBlob: DefaultClauseBlob): SelectCondition = appendClauseBlob("=", clauseBlob)
internal infix fun eq(clauseBlob: ClauseBlob): SelectCondition = appendClauseBlob("=", clauseBlob)

/**
* Creates an inequality comparison condition (!=).
Expand All @@ -78,9 +78,9 @@ public open class DefaultClauseBlob internal constructor(
* @param clauseBlob The BLOB column/function to compare against
* @return Condition expression comparing two BLOB columns
*/
internal infix fun neq(clauseBlob: DefaultClauseBlob): SelectCondition = appendClauseBlob("!=", clauseBlob)
internal infix fun neq(clauseBlob: ClauseBlob): SelectCondition = appendClauseBlob("!=", clauseBlob)

protected open fun appendBlob(notNullSymbol: String, nullSymbol: String, blob: ByteArray?): SelectCondition {
private fun appendBlob(notNullSymbol: String, nullSymbol: String, blob: ByteArray?): SelectCondition {
val sql = buildString {
if (!isFunction) {
append(table.tableName)
Expand All @@ -97,7 +97,7 @@ public open class DefaultClauseBlob internal constructor(
return SelectCondition(sql, if (blob == null) null else mutableListOf(blob))
}

private fun appendClauseBlob(symbol: String, clauseBlob: DefaultClauseBlob): SelectCondition {
private fun appendClauseBlob(symbol: String, clauseBlob: ClauseBlob): SelectCondition {
val sql = buildString {
append(table.tableName)
append('.')
Expand All @@ -113,13 +113,7 @@ public open class DefaultClauseBlob internal constructor(
}

override fun hashCode(): Int = valueName.hashCode() + table.tableName.hashCode()
override fun equals(other: Any?): Boolean = (other as? DefaultClauseBlob)?.let {
override fun equals(other: Any?): Boolean = (other as? ClauseBlob)?.let {
it.valueName == valueName && it.table.tableName == table.tableName
} ?: false
}

public expect fun ClauseBlob(
valueName: String,
table: Table<*>,
isFunction: Boolean,
): DefaultClauseBlob
}
37 changes: 0 additions & 37 deletions sqllin-dsl/src/jvmAndNativeMain/kotlin/com/ctrip/sqllin/dsl/sql/clause/OtherClauseBlob.kt
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion sqllin-processor/src/main/kotlin/com/ctrip/sqllin/processor/ClauseProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ class ClauseProcessor(
writer.write("import com.ctrip.sqllin.dsl.sql.clause.ClauseBoolean\n")
writer.write("import com.ctrip.sqllin.dsl.sql.clause.ClauseNumber\n")
writer.write("import com.ctrip.sqllin.dsl.sql.clause.ClauseString\n")
writer.write("import com.ctrip.sqllin.dsl.sql.clause.DefaultClauseBlob\n")
writer.write("import com.ctrip.sqllin.dsl.sql.clause.SetClause\n")
writer.write("import com.ctrip.sqllin.dsl.sql.PrimaryKeyInfo\n")
writer.write("import com.ctrip.sqllin.dsl.sql.Table\n\n")
Expand Down