Skip to content

Commit 8950d65

Browse files
authored
Merge branch 'berkeley' into dkijania/terraform_ci
2 parents ead5674 + c7d65e0 commit 8950d65

File tree

3 files changed

+28
-7
lines changed

3 files changed

+28
-7
lines changed

.github/workflows/nix.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: "Build nix"
2+
on:
3+
pull_request:
4+
push:
5+
branches:
6+
- develop
7+
- compatible
8+
- berkeley
9+
- releases/**
10+
- main
11+
jobs:
12+
tests:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v3
16+
with:
17+
fetch-depth: 0
18+
- uses: cachix/install-nix-action@v20
19+
- uses: DeterminateSystems/magic-nix-cache-action@v2
20+
- run: nix/pin.sh
21+
- run: nix build mina
22+
env:
23+
GIT_LFS_SKIP_SMUDGE: 1
24+
- run: nix develop mina

buildkite/src/Command/TestExecutive.dhall

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ in
3333
],
3434
label = "Build test-executive",
3535
key = "build-test-executive",
36-
target = Size.XLarge,
37-
`if` = Some "build.branch != 'develop' && build.branch != 'compatible' && build.branch != 'develop-next'"
36+
target = Size.XLarge
3837
},
3938

4039
execute = \(testName : Text) -> \(dependsOn : List Command.TaggedKey.Type) ->
@@ -53,8 +52,7 @@ in
5352
label = "${testName} integration test",
5453
key = "integration-test-${testName}",
5554
target = Size.Integration,
56-
depends_on = dependsOn,
57-
`if` = Some "build.branch != 'develop' && build.branch != 'compatible' && build.branch != 'develop-next'"
55+
depends_on = dependsOn
5856
},
5957

6058
buildJs = \(duneProfile : Text) ->
@@ -72,8 +70,7 @@ in
7270
],
7371
label = "Build JS integration tests",
7472
key = "build-js-tests",
75-
target = Size.XLarge,
76-
`if` = Some "build.branch != 'develop' && build.branch != 'compatible' && build.branch != 'develop-next'"
73+
target = Size.XLarge
7774
},
7875

7976
executeWithJs = \(testName : Text) -> \(dependsOn : List Command.TaggedKey.Type) ->
@@ -94,7 +91,6 @@ in
9491
key = "integration-test-${testName}",
9592
target = Size.Integration,
9693
depends_on = dependsOn,
97-
`if` = Some "build.branch != 'develop' && build.branch != 'compatible' && build.branch != 'develop-next'",
9894
soft_fail = Some (B/SoftFail.Boolean True)
9995
}
10096
}

nix/modules/mina.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ inputs:
6868
};
6969
libp2p-keypair = lib.mkOption {
7070
type = path;
71+
default = "/root/libp2p-keys/key";
7172
};
7273

7374
waitForRpc = lib.mkOption {

0 commit comments

Comments
 (0)