Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Bob
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OSS
Bob
Commits
3d7b2602
Verified
Commit
3d7b2602
authored
1 year ago
by
Volker Schukai
Browse files
Options
Downloads
Patches
Plain Diff
fix: text build script
parent
974d57d7
No related branches found
Branches containing commit
Tags
0.4.11
Tags containing commit
No related merge requests found
Pipeline
#26132
failed
1 year ago
Stage: build
Stage: deploy
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Taskfile.yml
+1
-1
1 addition, 1 deletion
Taskfile.yml
flake.nix
+3
-21
3 additions, 21 deletions
flake.nix
project.nix
+1
-1
1 addition, 1 deletion
project.nix
source/command.go
+1
-1
1 addition, 1 deletion
source/command.go
with
6 additions
and
24 deletions
Taskfile.yml
+
1
−
1
View file @
3d7b2602
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
flake.nix
+
3
−
21
View file @
3d7b2602
{
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
=
{
};
};
}
This diff is collapsed.
Click to expand it.
project.nix
+
1
−
1
View file @
3d7b2602
...
...
@@ -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
}
This diff is collapsed.
Click to expand it.
source/command.go
+
1
−
1
View file @
3d7b2602
...
...
@@ -42,7 +42,7 @@ type Definition struct {
}
func
(
d
*
Definition
)
PrintVersion
(
s
*
xflags
.
Settings
[
Definition
])
{
fmt
.
Println
(
release
.
GetMnemonic
()
+
" "
+
release
.
GetVersion
()
+
" ("
+
release
.
Get
BuildDate
()
+
")"
)
fmt
.
Println
(
release
.
GetMnemonic
()
+
" "
+
release
.
GetVersion
()
+
" ("
+
release
.
Get
Commit
()
+
")"
)
}
func
(
d
*
Definition
)
CutHTML
(
s
*
xflags
.
Settings
[
Definition
])
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment