rename jobsets to artiq-fast/artiq-full

This commit is contained in:
Sebastien Bourdeauducq 2019-07-17 19:19:43 +08:00
parent 0a231bb200
commit dfa5b47d9b
41 changed files with 14 additions and 14 deletions

View File

@ -3,7 +3,7 @@ let
artiqSrc = <artiqSrc>; artiqSrc = <artiqSrc>;
generatedNix = pkgs.runCommand "generated-nix" { buildInputs = [ pkgs.nix pkgs.git ]; } generatedNix = pkgs.runCommand "generated-nix" { buildInputs = [ pkgs.nix pkgs.git ]; }
'' ''
cp --no-preserve=mode,ownership -R ${./artiq} $out cp --no-preserve=mode,ownership -R ${./artiq-fast} $out
REV=`git --git-dir ${artiqSrc}/.git rev-parse HEAD` REV=`git --git-dir ${artiqSrc}/.git rev-parse HEAD`
MAJOR_VERSION=`cat ${artiqSrc}/MAJOR_VERSION` MAJOR_VERSION=`cat ${artiqSrc}/MAJOR_VERSION`
COMMIT_COUNT=`git --git-dir ${artiqSrc}/.git rev-list --count HEAD` COMMIT_COUNT=`git --git-dir ${artiqSrc}/.git rev-list --count HEAD`
@ -44,11 +44,11 @@ let
# installation for users. # installation for users.
matplotlib-qt = pkgs.lib.hydraJob (pkgs.python3Packages.matplotlib.override { enableQt = true; }); matplotlib-qt = pkgs.lib.hydraJob (pkgs.python3Packages.matplotlib.override { enableQt = true; });
# For Raspberry Pi JTAG servers # For Raspberry Pi JTAG servers
openocd-aarch64 = pkgs.lib.hydraJob ((import <nixpkgs> { system = "aarch64-linux"; }).callPackage ./artiq/pkgs/openocd.nix {}); openocd-aarch64 = pkgs.lib.hydraJob ((import <nixpkgs> { system = "aarch64-linux"; }).callPackage ./artiq-fast/pkgs/openocd.nix {});
}; };
in in
jobs // { jobs // {
generated-nix = pkgs.lib.hydraJob generatedNix; # used by sinara-systems generated-nix = pkgs.lib.hydraJob generatedNix; # used by artiq-full
channel = pkgs.releaseTools.channel rec { channel = pkgs.releaseTools.channel rec {
name = "main"; name = "main";
src = generatedNix; src = generatedNix;

View File

@ -53,9 +53,9 @@ let
"wipm3" "wipm3"
]; ];
artiq = import <m-labs> { inherit pkgs; }; artiq-fast = import <artiq-fast> { inherit pkgs; };
artiq-board = import <m-labs/artiq-board.nix> { inherit pkgs; }; artiq-board = import <artiq-fast/artiq-board.nix> { inherit pkgs; };
conda-artiq-board = import <m-labs/conda-artiq-board.nix> { inherit pkgs; }; conda-artiq-board = import <artiq-fast/conda-artiq-board.nix> { inherit pkgs; };
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "https://git.m-labs.hk/M-Labs/sinara-systems.git"; url = "https://git.m-labs.hk/M-Labs/sinara-systems.git";
rev = "$REV"; rev = "$REV";
@ -78,7 +78,7 @@ let
} // (pkgs.lib.optionalAttrs ((builtins.fromJSON (builtins.readFile json)).base == "standalone") { } // (pkgs.lib.optionalAttrs ((builtins.fromJSON (builtins.readFile json)).base == "standalone") {
"device-db-\''${target}-\''${variant}" = pkgs.stdenv.mkDerivation { "device-db-\''${target}-\''${variant}" = pkgs.stdenv.mkDerivation {
name = "device-db-\''${target}-\''${variant}"; name = "device-db-\''${target}-\''${variant}";
buildInputs = [ artiq.artiq ]; buildInputs = [ artiq-fast.artiq ];
phases = [ "buildPhase" ]; phases = [ "buildPhase" ];
buildPhase = " buildPhase = "
mkdir \$out mkdir \$out

View File

@ -4,12 +4,12 @@
'' ''
cat > $out << EOF cat > $out << EOF
{ {
"main": { "fast": {
"enabled": 1, "enabled": 1,
"hidden": false, "hidden": false,
"description": "Main ARTIQ packages and board support packages for HITL CI", "description": "Core ARTIQ packages to build fast for CI purposes",
"nixexprinput": "nixScripts", "nixexprinput": "nixScripts",
"nixexprpath": "main.nix", "nixexprpath": "artiq-fast.nix",
"checkinterval": 300, "checkinterval": 300,
"schedulingshares": 10, "schedulingshares": 10,
"enableemail": false, "enableemail": false,
@ -21,12 +21,12 @@
"artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git master 1", "emailresponsible": false } "artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git master 1", "emailresponsible": false }
} }
}, },
"sinara-systems": { "full": {
"enabled": 1, "enabled": 1,
"hidden": false, "hidden": false,
"description": "Board support packages for other Sinara systems", "description": "Full set of ARTIQ packages",
"nixexprinput": "nixScripts", "nixexprinput": "nixScripts",
"nixexprpath": "sinara-systems.nix", "nixexprpath": "artiq-full.nix",
"checkinterval": 86400, "checkinterval": 86400,
"schedulingshares": 1, "schedulingshares": 1,
"enableemail": false, "enableemail": false,
@ -36,7 +36,7 @@
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-19.03", "emailresponsible": false }, "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-19.03", "emailresponsible": false },
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }, "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
"sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false }, "sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false },
"m-labs": { "type": "sysbuild", "value": "artiq:main:generated-nix", "emailresponsible": false } "artiq-fast": { "type": "sysbuild", "value": "artiq:artiq-fast:generated-nix", "emailresponsible": false }
} }
}, },
"urukul": { "urukul": {