mirror of https://github.com/m-labs/artiq.git
bump major version number
This commit is contained in:
parent
94d3e74602
commit
c1a86f91d3
|
@ -17,7 +17,7 @@
|
||||||
pkgs = import nac3.inputs.nixpkgs { system = "x86_64-linux"; overlays = [ (import mozilla-overlay) ]; };
|
pkgs = import nac3.inputs.nixpkgs { system = "x86_64-linux"; overlays = [ (import mozilla-overlay) ]; };
|
||||||
pkgs-aarch64 = import nac3.inputs.nixpkgs { system = "aarch64-linux"; };
|
pkgs-aarch64 = import nac3.inputs.nixpkgs { system = "aarch64-linux"; };
|
||||||
|
|
||||||
artiqVersionMajor = 9;
|
artiqVersionMajor = 10;
|
||||||
artiqVersionMinor = self.sourceInfo.revCount or 0;
|
artiqVersionMinor = self.sourceInfo.revCount or 0;
|
||||||
artiqVersionId = self.sourceInfo.shortRev or "unknown";
|
artiqVersionId = self.sourceInfo.shortRev or "unknown";
|
||||||
artiqVersion = (builtins.toString artiqVersionMajor) + "." + (builtins.toString artiqVersionMinor) + "+" + artiqVersionId + ".beta";
|
artiqVersion = (builtins.toString artiqVersionMajor) + "." + (builtins.toString artiqVersionMinor) + "+" + artiqVersionId + ".beta";
|
||||||
|
|
|
@ -11,7 +11,7 @@ def get_rev():
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def get_version():
|
def get_version():
|
||||||
return os.getenv("VERSIONEER_OVERRIDE", default="9.0+unknown.beta")
|
return os.getenv("VERSIONEER_OVERRIDE", default="10.0+unknown.beta")
|
||||||
|
|
||||||
def get_rev():
|
def get_rev():
|
||||||
return os.getenv("VERSIONEER_REV", default="unknown")
|
return os.getenv("VERSIONEER_REV", default="unknown")
|
||||||
|
|
Loading…
Reference in New Issue