Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

Commit 66fa2e2

Browse files
Merge #3901
3901: [DEVOPS-1126] add required jobset to release.nix (#3852) r=disassembler a=disassembler (cherry picked from commit 54d803e) ## Description <!--- A brief description of this PR and the problem is trying to solve --> ## Linked issue <!--- Put here the relevant issue from YouTrack --> ## Type of change <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply and `~` in the ones that do not: --> - [ ] 🐞 Bug fix (non-breaking change which fixes an issue) - [ ] 🛠 New feature (non-breaking change which adds functionality) - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to change) - [ ] 🏭 Refactoring that does not change existing functionality but does improve things like code readability, structure etc - [ ] 🔨 New or improved tests for existing code - [ ] ⛑ git-flow chore (backport, hotfix, etc) ## Developer checklist <!--- A mental checklist for the developer submitting the PR. Put an `x` in all the boxes that apply and `~` in the ones that do not: ---> - [ ] I have read the [style guide](https://github.com/input-output-hk/cardano-sl/blob/develop/docs/style-guide.md) document, and my code follows the code style of this project. - [ ] If my code deals with exceptions, it follows the [guidelines](https://github.com/input-output-hk/cardano-sl/blob/develop/docs/exceptions.md). - [ ] I have updated any documentation accordingly, if needed. Documentation changes can be reflected in opening a PR on [cardanodocs.com](https://github.com/input-output-hk/cardanodocs.com), amending the inline [Haddock](https://www.haskell.org/haddock/) comments, any relevant README file or one of the document listed in the [docs](https://github.com/input-output-hk/cardano-sl/tree/develop/docs) directory. - [ ] CHANGELOG entry has been added and is linked to the correct PR on GitHub. ## Testing checklist <!-- If you aren't providing any tests as part of this PR, use this section to state clearly why. It needs to be a strong motivation and definitely the exception, not the rule. --> - [ ] I have added tests to cover my changes. - [ ] All new and existing tests passed. ## QA Steps <!--- Which are the steps needed to test this feature, if any? --> ## Screenshots (if available) <!--- Upload a GIF, an asciinema video or an image demoing the feature --> ## How to merge Send the message `bors r+` to merge this PR. For more information, see [`docs/how-to/bors.md`](https://github.com/input-output-hk/cardano-sl/blob/develop/docs/how-to/bors.md). Co-authored-by: Samuel Leathers <[email protected]> Co-authored-by: Samuel Leathers <[email protected]>
2 parents a956b5c + f0a06f9 commit 66fa2e2

File tree

2 files changed

+23
-2
lines changed

2 files changed

+23
-2
lines changed

appveyor.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 1.0.{build}
2+
image: Visual Studio 2015
3+
4+
build: off
5+
6+
test_script:
7+
- ps: echo "No Longer Used, check buildkite windows job"

release.nix

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,25 @@ let
6969
connectScripts = makeConnectScripts cluster;
7070
};
7171
};
72-
in mapped // {
72+
in pkgs.lib.fix (jobsets: mapped // {
7373
inherit walletIntegrationTests swaggerSchemaValidation shellcheckTests;
74+
inherit (pkgs) cabal2nix;
7475
nixpkgs = let
7576
wrapped = pkgs.runCommand "nixpkgs" {} ''
7677
ln -sv ${fixedNixpkgs} $out
7778
'';
7879
in if 0 <= builtins.compareVersions builtins.nixVersion "1.12" then wrapped else fixedNixpkgs;
79-
} // (builtins.listToAttrs (map makeRelease [ "mainnet" "staging" ]))
80+
required = pkgs.lib.hydraJob (pkgs.releaseTools.aggregate {
81+
name = "cardano-required-checks";
82+
constituents =
83+
let
84+
all = x: map (system: x.${system}) supportedSystems;
85+
in
86+
[
87+
(all jobsets.daedalus-bridge)
88+
(all jobsets.mainnet.connectScripts.wallet)
89+
jobsets.swaggerSchemaValidation
90+
jobsets.shellcheckTests
91+
];
92+
});
93+
} // (builtins.listToAttrs (map makeRelease [ "mainnet" "staging" ])))

0 commit comments

Comments
 (0)