Skip to content

Commit 70475b5

Browse files
cocreaturecocreature
committed
.
[ci] Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
1 parent e96e901 commit 70475b5

File tree

7 files changed

+62
-33
lines changed

7 files changed

+62
-33
lines changed

‎.github/actions/tests/scala_test/action.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ inputs:
8585
required: true
8686
daml_base_version:
8787
type: string
88-
required: false
89-
default: "0.3.21"
88+
required: true
9089

9190
runs:
9291
using: "composite"

‎.github/workflows/build.scala_test_for_compose.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ on:
2525
type: string
2626
required: false
2727
default: ""
28+
daml_base_version:
29+
type: string
30+
required: true
31+
2832

2933
jobs:
3034

@@ -99,3 +103,4 @@ jobs:
99103
failure_notifications_invoker_url: ${{ secrets.FAILURE_NOTIFICATIONS_INVOKER_URL }}
100104
failure_notifications_slack_channel: ${{ secrets.FAILURE_NOTIFICATIONS_SLACK_CHANNEL }}
101105
with_canton: ${{ inputs.with_canton }}
106+
daml_base_version: ${{ inputs.daml_base_version }}

‎.github/workflows/build.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ on:
77
required: false
88
default: ''
99
type: string
10+
daml_base_version:
11+
type: string
12+
required: false
13+
default: "0.3.21"
1014

1115
permissions:
1216
id-token: write # Required for GCP Workload Identity for failure notifications
@@ -66,6 +70,7 @@ jobs:
6670
parallelism: 4
6771
test_name: simtime
6872
commit_sha: ${{ inputs.commit_sha }}
73+
daml_base_version: ${{ inputs.daml_base_version }}
6974
secrets: inherit
7075

7176
scala_test_resource_intensive:
@@ -77,6 +82,7 @@ jobs:
7782
parallelism: 2
7883
test_name: resource-intensive
7984
commit_sha: ${{ inputs.commit_sha }}
85+
daml_base_version: ${{ inputs.daml_base_version }}
8086
secrets: inherit
8187

8288
scala_test_record_time_tolerance:
@@ -88,6 +94,7 @@ jobs:
8894
parallelism: 1
8995
test_name: record-time-tolerance
9096
commit_sha: ${{ inputs.commit_sha }}
97+
daml_base_version: ${{ inputs.daml_base_version }}
9198
secrets: inherit
9299

93100
scala_test_disaster_recovery:
@@ -99,6 +106,7 @@ jobs:
99106
parallelism: 1
100107
test_name: disaster-recovery
101108
commit_sha: ${{ inputs.commit_sha }}
109+
daml_base_version: ${{ inputs.daml_base_version }}
102110
secrets: inherit
103111

104112
scala_test_with_cometbft:
@@ -109,6 +117,7 @@ jobs:
109117
parallelism: 1
110118
test_name: cometbft
111119
commit_sha: ${{ inputs.commit_sha }}
120+
daml_base_version: ${{ inputs.daml_base_version }}
112121
secrets: inherit
113122

114123
scala_test_with_bft:
@@ -120,6 +129,7 @@ jobs:
120129
parallelism: 1
121130
test_name: canton bft
122131
commit_sha: ${{ inputs.commit_sha }}
132+
daml_base_version: ${{ inputs.daml_base_version }}
123133
secrets: inherit
124134

125135

@@ -134,6 +144,7 @@ jobs:
134144
test_name: wall-clock-time
135145
with_gcp_creds: true
136146
commit_sha: ${{ inputs.commit_sha }}
147+
daml_base_version: ${{ inputs.daml_base_version }}
137148
secrets: inherit
138149

139150
scala_test_wall_clock_time_bft:
@@ -147,6 +158,7 @@ jobs:
147158
with_gcp_creds: true
148159
pre_sbt_cmd: "export SPLICE_USE_BFT_SEQUENCER=1"
149160
run_if_commit_tag: 'bft'
161+
daml_base_version: ${{ inputs.daml_base_version }}
150162
secrets: inherit
151163

152164
scala_test_frontend_wall_clock_time:
@@ -159,6 +171,7 @@ jobs:
159171
test_name: frontend-wall-clock-time
160172
is_frontend_test: true
161173
commit_sha: ${{ inputs.commit_sha }}
174+
daml_base_version: ${{ inputs.daml_base_version }}
162175
secrets: inherit
163176

164177
scala_test_frontend_simtime:
@@ -171,6 +184,7 @@ jobs:
171184
test_name: frontend-simtime
172185
is_frontend_test: true
173186
commit_sha: ${{ inputs.commit_sha }}
187+
daml_base_version: ${{ inputs.daml_base_version }}
174188
secrets: inherit
175189

176190
scala_test_docker_compose:
@@ -182,6 +196,7 @@ jobs:
182196
parallelism: 2
183197
test_name: docker-compose
184198
commit_sha: ${{ inputs.commit_sha }}
199+
daml_base_version: ${{ inputs.daml_base_version }}
185200
secrets: inherit
186201

187202
scala_test_local_net:
@@ -193,6 +208,7 @@ jobs:
193208
test_name: docker-compose
194209
with_canton: false
195210
start_canton_options: ""
211+
daml_base_version: ${{ inputs.daml_base_version }}
196212
secrets: inherit
197213

198214
scala_test_app_upgrade:
@@ -207,6 +223,7 @@ jobs:
207223
skip_if_regex: "\\[breaking\\]"
208224
skip_if_files_changed: "nix/canton-sources.json"
209225
commit_sha: ${{ inputs.commit_sha }}
226+
daml_base_version: ${{ inputs.daml_base_version }}
210227
secrets: inherit
211228

212229
ui_tests:
@@ -237,6 +254,7 @@ jobs:
237254
test_name: without-canton
238255
with_gcp_creds: true
239256
commit_sha: ${{ inputs.commit_sha }}
257+
daml_base_version: ${{ inputs.daml_base_version }}
240258
secrets: inherit
241259

242260
final_result:

‎apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/EnvironmentDefinition.scala‎

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import org.lfdecentralizedtrust.splice.console.{
2828
}
2929
import org.lfdecentralizedtrust.splice.environment.{
3030
DarResources,
31-
PackageResource,
3231
SpliceConsoleEnvironment,
3332
SpliceEnvironment,
3433
SpliceEnvironmentFactory,
@@ -108,35 +107,22 @@ case class EnvironmentDefinition(
108107
})
109108
})
110109

111-
private lazy val initialPackageVersionMap: Map[String, String] = {
112-
import cats.syntax.either.*, io.circe.parser.*
113-
val envVar = sys.env.getOrElse("INITIAL_PACKAGE_VERSIONS", "{}")
114-
decode[Map[String, String]](envVar).valueOr(err =>
115-
throw new IllegalArgumentException(
116-
s"Failed to decode initial package versions: $envVar, error: $err"
117-
)
118-
)
119-
}
120-
121-
def initialPackageVersion(pkg: PackageResource): String =
122-
initialPackageVersionMap.getOrElse(
123-
pkg.bootstrap.metadata.name,
124-
pkg.bootstrap.metadata.version.toString,
125-
)
126-
127110
def withInitialPackageVersions: EnvironmentDefinition =
128111
addConfigTransforms(
129112
(_, config) =>
130113
ConfigTransforms.updateAllSvAppFoundDsoConfigs_(
131114
_.copy(
132-
// FIXME: read config from env var or something
133115
initialPackageConfig = InitialPackageConfig(
134-
amuletVersion = initialPackageVersion(DarResources.amulet),
135-
amuletNameServiceVersion = initialPackageVersion(DarResources.amuletNameService),
136-
dsoGovernanceVersion = initialPackageVersion(DarResources.dsoGovernance),
137-
validatorLifecycleVersion = initialPackageVersion(DarResources.validatorLifecycle),
138-
walletVersion = initialPackageVersion(DarResources.wallet),
139-
walletPaymentsVersion = initialPackageVersion(DarResources.walletPayments),
116+
amuletVersion = InitialPackageVersions.initialPackageVersion(DarResources.amulet),
117+
amuletNameServiceVersion =
118+
InitialPackageVersions.initialPackageVersion(DarResources.amuletNameService),
119+
dsoGovernanceVersion =
120+
InitialPackageVersions.initialPackageVersion(DarResources.dsoGovernance),
121+
validatorLifecycleVersion =
122+
InitialPackageVersions.initialPackageVersion(DarResources.validatorLifecycle),
123+
walletVersion = InitialPackageVersions.initialPackageVersion(DarResources.wallet),
124+
walletPaymentsVersion =
125+
InitialPackageVersions.initialPackageVersion(DarResources.walletPayments),
140126
)
141127
)
142128
)(config),
@@ -148,7 +134,7 @@ case class EnvironmentDefinition(
148134
instance.copy(dars =
149135
Seq(
150136
java.nio.file.Paths.get(
151-
s"daml/dars/splitwell-${initialPackageVersion(DarResources.splitwell)}.dar"
137+
s"daml/dars/splitwell-${InitialPackageVersions.initialPackageVersion(DarResources.splitwell)}.dar"
152138
)
153139
)
154140
)
@@ -159,8 +145,9 @@ case class EnvironmentDefinition(
159145
(_, config) =>
160146
ConfigTransforms.updateAllSplitwellAppConfigs_(c =>
161147
c.copy(
162-
requiredDarVersion =
163-
PackageVersion.assertFromString(initialPackageVersion(DarResources.splitwell))
148+
requiredDarVersion = PackageVersion.assertFromString(
149+
InitialPackageVersions.initialPackageVersion(DarResources.splitwell)
150+
)
164151
)
165152
)(config),
166153
)

‎apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/InitialPackageVersions.scala‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package org.lfdecentralizedtrust.splice.integration
2+
3+
import org.lfdecentralizedtrust.splice.environment.PackageResource
4+
5+
object InitialPackageVersions {
6+
private lazy val initialPackageVersionMap: Map[String, String] = {
7+
import cats.syntax.either.*, io.circe.parser.*
8+
val envVar = sys.env.getOrElse("INITIAL_PACKAGE_VERSIONS", "{}")
9+
decode[Map[String, String]](envVar).valueOr(err =>
10+
throw new IllegalArgumentException(
11+
s"Failed to decode initial package versions: $envVar, error: $err"
12+
)
13+
)
14+
}
15+
16+
def initialPackageVersion(pkg: PackageResource): String =
17+
initialPackageVersionMap.getOrElse(
18+
pkg.bootstrap.metadata.name,
19+
pkg.bootstrap.metadata.version.toString,
20+
)
21+
}

‎apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/SpliceTests.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -572,8 +572,8 @@ object SpliceTests extends LazyLogging {
572572
}
573573
}
574574

575-
// FIXME
576-
protected def splitwellDarPath = "daml/dars/splitwell-0.1.8.dar"
575+
protected def splitwellDarPath =
576+
"daml/dars/splitwell-InitialPackageVersions.initialPackageVersion(DarResources.splitwell).dar"
577577
}
578578

579579
object BracketSynchronous {

‎apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/WalletIntegrationTest.scala‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import org.lfdecentralizedtrust.splice.validator.automation.AcceptTransferPreapp
2121
import org.lfdecentralizedtrust.splice.wallet.admin.api.client.commands.HttpWalletAppClient.CreateTransferPreapprovalResponse
2222
import org.lfdecentralizedtrust.splice.wallet.store.{
2323
BalanceChangeTxLogEntry,
24-
// PartyAndAmount,
2524
TransferTxLogEntry,
2625
TxLogEntry,
2726
}
@@ -561,7 +560,7 @@ class WalletIntegrationTest
561560
}
562561
}
563562

564-
"TransferPreapprovals can be created, looked up, cancelled and amulet can be sent through them" in {
563+
"TransferPreapprovals can be created, looked up, cancelled and amulet can be sent through them" taggedAs (org.lfdecentralizedtrust.splice.util.Tags.SpliceAmulet_0_1_9) in {
565564
implicit env =>
566565
val aliceUserParty = onboardWalletUser(aliceWalletClient, aliceValidatorBackend)
567566
aliceValidatorWalletClient.tap(10.0)

0 commit comments

Comments
 (0)