Skip to content

Commit 67f08d9

Browse files
committed
fix minor bug with installing deps
1 parent c5867e7 commit 67f08d9

5 files changed

Lines changed: 9 additions & 7 deletions

File tree

‎resources/environments/csharp/Example.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
3-
<PackageReference
4-
${CLIENT_ARTIFACT}
5-
/>
3+
${CLIENT_ARTIFACT}
64
</ItemGroup>
75
<PropertyGroup>
86
<OutputType>Exe</OutputType>

‎resources/environments/java/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repositories {
88
}
99

1010
dependencies {
11-
implementation "${CLIENT_ARTIFACT}"
11+
implementation ${CLIENT_ARTIFACT}
1212
implementation "org.slf4j:slf4j-nop:2.0.17"
1313
}
1414

‎src/main/java/com/dtsx/docs/core/planner/fixtures/JSFixture.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
import java.nio.file.Path;
1818

19+
import static com.dtsx.docs.HelperCli.CLI_DIR;
20+
1921
/// Represents a JavaScript fixture file used to set up, reset, and tear down database state for testing, with being JavaScript used for ease of scripting.
2022
///
2123
/// JS fixture files are of the following format, where each function is optional:
@@ -78,7 +80,7 @@ public static void installDependencies(TestCtx ctx) {
7880
CliLogger.debug("Installing JSFixture dependencies in " + Path.of(".").toAbsolutePath());
7981

8082
val res = CliLogger.loading("Installing JS fixture dependencies", (_) -> {
81-
return ExternalPrograms.npm(ctx).run("ci", "--prefer-offline"); // TODO use NPM_CONFIG_CACHE in CI
83+
return ExternalPrograms.npm(ctx).run(CLI_DIR, "ci", "--prefer-offline"); // TODO use NPM_CONFIG_CACHE in CI
8284
});
8385

8486
if (res.exitCode() != 0) {

‎src/main/java/com/dtsx/docs/core/runner/drivers/ClientDriver.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.dtsx.docs.config.ctx.BaseScriptRunnerCtx;
55
import com.dtsx.docs.core.planner.meta.snapshot.meta.OutputJsonifySourceMeta;
66
import com.dtsx.docs.core.runner.ExecutionEnvironment.TestFileModifierFlags;
7+
import com.dtsx.docs.lib.CliLogger;
78
import com.dtsx.docs.lib.ExternalPrograms.ExternalProgram;
89
import com.dtsx.docs.lib.ExternalPrograms.RunResult;
910
import com.dtsx.docs.core.runner.ExecutionEnvironment;
@@ -116,6 +117,7 @@ protected void replaceArtifactPlaceholder(ExecutionEnvironment execEnv, String f
116117
try {
117118
val content = Files.readString(path);
118119
val updatedContent = content.replace("${CLIENT_ARTIFACT}", artifact());
120+
CliLogger.println(true, updatedContent);
119121
Files.writeString(path, updatedContent);
120122
} catch (Exception e) {
121123
throw new RunException("Failed to update " + file + " with client version", e);

‎src/main/java/com/dtsx/docs/core/runner/drivers/ClientLanguage.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
@Getter
1818
@RequiredArgsConstructor
1919
public enum ClientLanguage {
20-
JAVA(".java", "com.datastax.astra:astra-db-java:2.+", JavaDriver::new),
20+
JAVA(".java", "\"com.datastax.astra:astra-db-java:2.+\"", JavaDriver::new),
2121
PYTHON(".py", "astrapy", PythonDriver::new),
2222
TYPESCRIPT(".ts", "@datastax/astra-db-ts", TypeScriptDriver::new),
23-
CSHARP(".cs", "Include=\"DataStax.AstraDB.DataApi\" Version=\"2.*-*\"", CSharpDriver::new),
23+
CSHARP(".cs", "<PackageReference Include=\"DataStax.AstraDB.DataApi\" Version=\"2.*-*\"/>", CSharpDriver::new),
2424
// GO(".go", null, GoDriver::new),
2525
BASH(".sh", null, BashDriver::new);
2626

0 commit comments

Comments
 (0)