Skip to content
Snippets Groups Projects
Verified Commit 3d7b2602 authored by Volker Schukai's avatar Volker Schukai :alien:
Browse files

fix: text build script

parent 974d57d7
No related branches found
Tags 0.4.11
No related merge requests found
Pipeline #26132 failed
...@@ -17,7 +17,7 @@ tasks: ...@@ -17,7 +17,7 @@ tasks:
sh: echo "$DEVENV_ROOT" sh: echo "$DEVENV_ROOT"
cmds: cmds:
- devenv shell build-app - nix build --no-link --out-link dist/app
sources: sources:
- source/**/*.go - source/**/*.go
- source/**/*.mod - source/**/*.mod
......
{ {
description = "This is a Alvine Cloud NixOS configuration flake."; description = "Configuration for the bob project";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
projectDefinition = import ./project.nix; projectDefinition = import ./project.nix;
buildRoot = ./.; buildRoot = ./.;
## if you want to debug the container, you can enable the debug package
enableDebugPackage = true; enableDebugPackage = true;
portAsString = toString projectDefinition.k8s.port; portAsString = toString projectDefinition.k8s.port;
...@@ -86,8 +85,8 @@ ...@@ -86,8 +85,8 @@
"-X '${projectDefinition.modulePath}/release.buildDate=${lastModifiedDate}'" "-X '${projectDefinition.modulePath}/release.buildDate=${lastModifiedDate}'"
]; ];
vendorHash = null; #vendorHash = null;
#vendorHash = projectDefinition.vendorHash; vendorHash = projectDefinition.vendorHash;
#vendorHash = system.lib.fakeHash; #vendorHash = system.lib.fakeHash;
proxyVendor = true; proxyVendor = true;
...@@ -143,10 +142,6 @@ ...@@ -143,10 +142,6 @@
${config.treefmt.build.wrapper}/bin/treefmt ${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 { rm-gitlab-pipelines.exec = import ./system/scripts/rm-gitlab-pipelines.nix {
inherit pkgs config buildRoot projectDefinition; inherit pkgs config buildRoot projectDefinition;
}; };
...@@ -167,17 +162,12 @@ ...@@ -167,17 +162,12 @@
inherit pkgs config buildRoot projectDefinition versionsTool workingDirectory; inherit pkgs config buildRoot projectDefinition versionsTool workingDirectory;
}; };
# build-image.exec = import ./system/scripts/build-images.nix {
# inherit pkgs config buildRoot projectDefinition;
# };
}; };
imports = []; imports = [];
packages = with pkgs; [ packages = with pkgs; [
inputs.versionsTool.defaultPackage."${builtins.currentSystem}" inputs.versionsTool.defaultPackage."${builtins.currentSystem}"
go-task go-task
]; ];
...@@ -193,16 +183,8 @@ ...@@ -193,16 +183,8 @@
}; };
}; };
flake = { flake = {
}; };
}; };
} }
...@@ -5,6 +5,6 @@ ...@@ -5,6 +5,6 @@
supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]; supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
compileForSystems = ["linux/arm64" "linux/amd64" "darwin/amd64" "windows/amd64"]; compileForSystems = ["linux/arm64" "linux/amd64" "darwin/amd64" "windows/amd64"];
modulePath = "gitlab.schukai.com/oss/bob"; 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 vendorHash = null; ## do not change this line; it will be updated automatically
} }
...@@ -42,7 +42,7 @@ type Definition struct { ...@@ -42,7 +42,7 @@ type Definition struct {
} }
func (d *Definition) PrintVersion(s *xflags.Settings[Definition]) { 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]) { func (d *Definition) CutHTML(s *xflags.Settings[Definition]) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment