Skip to content

Commit 916ec36

Browse files
authored
Merge branch 'master' into dkijania/remove_terraform_files
2 parents 8e65643 + c50d627 commit 916ec36

File tree

4 files changed

+5
-59
lines changed

4 files changed

+5
-59
lines changed

buildkite/scripts/build-artifact.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ else
1717
fi
1818

1919

20-
# TODO: Stop building lib_p2p multiple times by pulling from buildkite-agent artifacts or docker or somewhere
21-
echo "--- Build libp2p_helper TODO: use the previously uploaded build artifact"
20+
echo "--- Build libp2p_helper"
2221
make -C src/app/libp2p_helper
2322

2423
MAINNET_TARGETS=""

buildkite/src/Command/Libp2pHelperBuild.dhall

Lines changed: 0 additions & 41 deletions
This file was deleted.

buildkite/src/Command/MinaArtifact.dhall

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ let JobSpec = ../Pipeline/JobSpec.dhall
1616

1717
let Size = ./Size.dhall
1818

19-
let Libp2p = ./Libp2pHelperBuild.dhall
20-
2119
let DockerImage = ./DockerImage.dhall
2220

2321
let DebianVersions = ../Constants/DebianVersions.dhall
@@ -320,20 +318,14 @@ let onlyDebianPipeline
320318
= \(spec : MinaBuildSpec.Type)
321319
-> pipelineBuilder
322320
spec
323-
[ Libp2p.step spec.debVersion spec.buildFlags
324-
, build_artifacts spec
325-
, publish_to_debian_repo spec
326-
]
321+
[ build_artifacts spec, publish_to_debian_repo spec ]
327322

328323
let pipeline
329324
: MinaBuildSpec.Type -> Pipeline.Config.Type
330325
= \(spec : MinaBuildSpec.Type)
331326
-> pipelineBuilder
332327
spec
333-
( [ Libp2p.step spec.debVersion spec.buildFlags
334-
, build_artifacts spec
335-
, publish_to_debian_repo spec
336-
]
328+
( [ build_artifacts spec, publish_to_debian_repo spec ]
337329
# docker_commands spec
338330
)
339331

buildkite/src/Jobs/Lint/Xrefcheck.dhall

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
let B = ../../External/Buildkite.dhall
2-
31
let SelectFiles = ../../Lib/SelectFiles.dhall
42

53
let Pipeline = ../../Pipeline/Dsl.dhall
@@ -14,8 +12,6 @@ let Command = ../../Command/Base.dhall
1412

1513
let Size = ../../Command/Size.dhall
1614

17-
let B/SoftFail = B.definitions/commandStep/properties/soft_fail/Type
18-
1915
in Pipeline.build
2016
Pipeline.Config::{
2117
, spec = JobSpec::{
@@ -39,8 +35,9 @@ in Pipeline.build
3935
[ Cmd.runInDocker
4036
Cmd.Docker::{
4137
, image = (../../Constants/ContainerImages.dhall).xrefcheck
38+
, useBash = False
4239
}
43-
( "awesome_bot -allow-dupe "
40+
( "awesome_bot --allow-dupe "
4441
++ "--allow-redirect "
4542
++ "--allow 403,401 "
4643
++ "--skip-save-results "
@@ -55,7 +52,6 @@ in Pipeline.build
5552
, label = "Verifies references in markdown"
5653
, key = "xrefcheck"
5754
, target = Size.Multi
58-
, soft_fail = Some (B/SoftFail.Boolean True)
5955
}
6056
]
6157
}

0 commit comments

Comments
 (0)