diff --git a/Taskfile.yml b/Taskfile.yml index 2ef8946fe619acd7f294747686f768d42b8c78a0..f8bcaaabf3dd2f1e7c2ebeec5bf66de5b6c56734 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -17,7 +17,7 @@ tasks: sh: echo "$DEVENV_ROOT" cmds: - - devenv shell build-app + - nix build --no-link --out-link dist/app sources: - source/**/*.go - source/**/*.mod diff --git a/flake.nix b/flake.nix index 7a0f268e5e485cf5e409d10397118597b93920f8..ec02c1e35745048352c4d0dcbd4042f297d99884 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "This is a Alvine Cloud NixOS configuration flake."; + description = "Configuration for the bob project"; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; @@ -44,7 +44,6 @@ projectDefinition = import ./project.nix; buildRoot = ./.; - ## if you want to debug the container, you can enable the debug package enableDebugPackage = true; portAsString = toString projectDefinition.k8s.port; @@ -86,8 +85,8 @@ "-X '${projectDefinition.modulePath}/release.buildDate=${lastModifiedDate}'" ]; - vendorHash = null; - #vendorHash = projectDefinition.vendorHash; + #vendorHash = null; + vendorHash = projectDefinition.vendorHash; #vendorHash = system.lib.fakeHash; proxyVendor = true; @@ -143,10 +142,6 @@ ${config.treefmt.build.wrapper}/bin/treefmt ''; - # post-init-setup.exec = import ./system/scripts/post-init-setup.nix { - # inherit pkgs config buildRoot projectDefinition; - # }; - rm-gitlab-pipelines.exec = import ./system/scripts/rm-gitlab-pipelines.nix { inherit pkgs config buildRoot projectDefinition; }; @@ -167,17 +162,12 @@ inherit pkgs config buildRoot projectDefinition versionsTool workingDirectory; }; - # build-image.exec = import ./system/scripts/build-images.nix { - # inherit pkgs config buildRoot projectDefinition; - # }; }; imports = []; packages = with pkgs; [ inputs.versionsTool.defaultPackage."${builtins.currentSystem}" - - go-task ]; @@ -193,16 +183,8 @@ }; }; - - flake = { - - - - }; - - }; } diff --git a/project.nix b/project.nix index 012324ec1394a48a177566fdd135e9b8c0a0bbe2..ebf1232ef4f8c6364dd5d30a7351bf02bc0ee4d4 100644 --- a/project.nix +++ b/project.nix @@ -5,6 +5,6 @@ supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]; compileForSystems = ["linux/arm64" "linux/amd64" "darwin/amd64" "windows/amd64"]; modulePath = "gitlab.schukai.com/oss/bob"; - version = "0.1.0"; ## do not change this line; it will be updated automatically + version = "0.4.10"; ## do not change this line; it will be updated automatically vendorHash = null; ## do not change this line; it will be updated automatically } diff --git a/source/command.go b/source/command.go index a16c5d0639af6e49b44fd8d9781785f6864432b6..bbfe296064258dff9b4ca4c2cfb727db30e5f0ad 100644 --- a/source/command.go +++ b/source/command.go @@ -42,7 +42,7 @@ type Definition struct { } func (d *Definition) PrintVersion(s *xflags.Settings[Definition]) { - fmt.Println(release.GetMnemonic() + " " + release.GetVersion() + " (" + release.GetBuildDate() + ")") + fmt.Println(release.GetMnemonic() + " " + release.GetVersion() + " (" + release.GetCommit() + ")") } func (d *Definition) CutHTML(s *xflags.Settings[Definition]) {