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

fix: test ci

parent 09ef0b37
No related branches found
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 45
− 44
View file @ 6cae56ec
## DO NOT EDIT THIS FILE MANUALLY, IT IS GENERATED BY NIX
image: docker-registry.schukai.com:443/nixos-ci-devenv:latest image: docker-registry.schukai.com:443/nixos-ci-devenv:latest
services: services:
...@@ -42,4 +43,4 @@ release: ...@@ -42,4 +43,4 @@ release:
script: script:
- devenv shell deploy-app - devenv shell deploy-app
#- cd source; goreleaser release --clean #- cd source; goreleaser release --clean
## DO NOT EDIT THIS FILE MANUALLY, IT IS GENERATED BY NIX
README.md
+ 14
− 17
View file @ 6cae56ec
...@@ -4,7 +4,6 @@ This tool helps to increment the version number of a project. ...@@ -4,7 +4,6 @@ This tool helps to increment the version number of a project.
You can download the tool here: [download.schukai.com/tools/version/](http://download.schukai.com/tools/version/). You can download the tool here: [download.schukai.com/tools/version/](http://download.schukai.com/tools/version/).
```bash ```bash
echo "1.0.0" | version patch echo "1.0.0" | version patch
# 1.0.1 # 1.0.1
...@@ -53,7 +52,6 @@ version patch --git ...@@ -53,7 +52,6 @@ version patch --git
With the command build the current build date can be output. With the command build the current build date can be output.
```bash ```bash
version build version build
``` ```
...@@ -100,7 +98,6 @@ this command does not write the result to a file or tag the git repository. ...@@ -100,7 +98,6 @@ this command does not write the result to a file or tag the git repository.
version predict version predict
``` ```
**Makefile** **Makefile**
```makefile ```makefile
......
Taskfile.yaml
+ 1
− 1
View file @ 6cae56ec
/nix/store/lfy3spmspb2bnzwg8359nn58q1hzdyv5-Taskfile.yaml /nix/store/4bvalx54rgxmryi1jx7k70aq4ccr7phq-Taskfile.yaml
\ No newline at end of file \ No newline at end of file
bin/go-compile.sh
+ 27
− 28
View file @ 6cae56ec
#!/usr/bin/env bash #!/usr/bin/env bash
set -x set -x
SOURCE_PATH=$1 SOURCE_PATH=$1
BUILD_PATH=$2 BUILD_PATH=$2
COMPONENT_SLUG=$3 COMPONENT_SLUG=$3
......
data/index.html
+ 80
− 45
View file @ 6cae56ec
<!doctype html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1" />
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" <link
integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"> href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css"
rel="stylesheet"
integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC"
crossorigin="anonymous"
/>
<style> <style>
body { body {
background-color: #ffffff; background-color: #ffffff;
} }
</style> </style>
<title>Version | Download Portal schukai GmbH</title> <title>Version | Download Portal schukai GmbH</title>
</head> </head>
<body> <body>
<div
class="d-flex flex-column align-items-center justify-content-center"
<div class="d-flex flex-column align-items-center justify-content-center" style="height: 100vh"
style="height:100vh;"> >
<div class="text-center"> <div class="text-center">
<a href="https://www.schukai.com" class="text-decoration-none text-white text-decoration"><img <a
src="https://cdn.alvine.io/image/logo/schukai-rot.svg" width="300px"></a> href="https://www.schukai.com"
<br> class="text-decoration-none text-white text-decoration"
><img
src="https://cdn.alvine.io/image/logo/schukai-rot.svg"
width="300px"
/></a>
<br />
<div class="card mt-5"> <div class="card mt-5">
<div class="card-header"> <div class="card-header">Version</div>
Version
</div>
<ul class="list-group"> <ul class="list-group">
<li class="list-group-item"><a class="text-decoration-none link-danger" href="./version-linux-386">version-linux-386</a></li> <li class="list-group-item">
<li class="list-group-item"><a class="text-decoration-none link-danger" href="./version-linux-amd64">version-linux-amd64</a></li> <a
<li class="list-group-item"><a class="text-decoration-none link-danger" href="./version-linux-arm">version-linux-arm</a></li> class="text-decoration-none link-danger"
<li class="list-group-item"><a class="text-decoration-none link-danger" href="./version-linux-arm64">version-linux-arm64</a></li> href="./version-linux-386"
<li class="list-group-item"><a class="text-decoration-none link-danger" href="./version-windows">version-windows</a></li> >version-linux-386</a
>
</li>
<li class="list-group-item">
<a
class="text-decoration-none link-danger"
href="./version-linux-amd64"
>version-linux-amd64</a
>
</li>
<li class="list-group-item">
<a
class="text-decoration-none link-danger"
href="./version-linux-arm"
>version-linux-arm</a
>
</li>
<li class="list-group-item">
<a
class="text-decoration-none link-danger"
href="./version-linux-arm64"
>version-linux-arm64</a
>
</li>
<li class="list-group-item">
<a
class="text-decoration-none link-danger"
href="./version-windows"
>version-windows</a
>
</li>
</ul> </ul>
</div> </div>
<p class="mt-5"> <p class="mt-5">
<a href="https://about.schukai.com/de/impressum/" class="text-decoration-none text-decoration" <a
style="color:#c10000">Imprint</a></p> href="https://about.schukai.com/de/impressum/"
class="text-decoration-none text-decoration"
style="color: #c10000"
>Imprint</a
>
</p>
</div> </div>
</div> </div>
<!-- <!--
<div class="d-flex flex-column align-items-center justify-content-center" <div class="d-flex flex-column align-items-center justify-content-center"
style="height:100vh;"> style="height:100vh;">
...@@ -73,10 +108,10 @@ ...@@ -73,10 +108,10 @@
</div> </div>
</div> --> </div> -->
<script
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js" src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js"
integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM"
crossorigin="anonymous"></script> crossorigin="anonymous"
></script>
</body> </body>
</html> </html>
data/version.yaml
+ 6
− 6
View file @ 6cae56ec
devenv.nix
+ 274
− 671
View file @ 6cae56ec
This diff is collapsed.
flake.nix
+ 49
− 65
View file @ 6cae56ec
...@@ -4,14 +4,17 @@ ...@@ -4,14 +4,17 @@
# Nixpkgs / NixOS version to use. # Nixpkgs / NixOS version to use.
inputs.nixpkgs.url = "nixpkgs/nixos-23.05"; inputs.nixpkgs.url = "nixpkgs/nixos-23.05";
outputs = { self, nixpkgs }: outputs = {
let self,
nixpkgs,
}: let
# to work with older version of flakes # to work with older version of flakes
lastModifiedDate = self.lastModifiedDate or self.lastModified or "19700101"; lastModifiedDate = self.lastModifiedDate or self.lastModified or "19700101";
rootPath = ./.; rootPath = ./.;
project = import "${rootPath}/project.nix";
# System types to support. # System types to support.
supportedSystems = ["x86_64-linux" "x86_64-windows" "x86_64-darwin"]; supportedSystems = ["x86_64-linux" "x86_64-windows" "x86_64-darwin"];
...@@ -20,15 +23,10 @@ ...@@ -20,15 +23,10 @@
# Nixpkgs instantiated for supported system types. # Nixpkgs instantiated for supported system types.
nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;}); nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;});
in {
in packages = forAllSystems (system: let
{
packages = forAllSystems (system:
let
pkgs = nixpkgsFor.${system}; pkgs = nixpkgsFor.${system};
in in {
{
version = pkgs.buildGoModule { version = pkgs.buildGoModule {
name = "version"; name = "version";
...@@ -37,18 +35,8 @@ ...@@ -37,18 +35,8 @@
src = ././source; src = ././source;
tags = []; # add your tags here (eq "netgo" "osusergo" "static_build") tags = []; # add your tags here (eq "netgo" "osusergo" "static_build")
# This hash locks the dependencies of this package. It is
# necessary because of how Go requires network access to resolve
# VCS. See https://www.tweag.io/blog/2021-03-04-gomod2nix/ for
# details. Normally one can build with a fake sha256 and rely on native Go
# mechanisms to tell you what the hash should be or determine what
# it should be "out-of-band" with other tooling (eg. gomod2nix).
# To begin with it is recommended to set this, but one must
# remeber to bump this hash when your dependencies change.
#vendorSha256 = pkgs.lib.fakeSha256;
#vendorHash = pkgs.lib.fakeHash; #vendorHash = pkgs.lib.fakeHash;
vendorHash = "sha256-j3gYTLV+EvGILC1qWiLCPEaSF+XKVwd27pwjckXsT9Q="; vendorHash = project.vendorHash;
meta = with nixpkgs.legacyPackages.${system}.lib; { meta = with nixpkgs.legacyPackages.${system}.lib; {
description = "Version is a program that automates and simplifies the process of incrementing version numbers for software projects."; description = "Version is a program that automates and simplifies the process of incrementing version numbers for software projects.";
...@@ -56,19 +44,15 @@ ...@@ -56,19 +44,15 @@
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; ["schukai GmbH"]; maintainers = with maintainers; ["schukai GmbH"];
}; };
}; };
default = self.packages.${system}.version; default = self.packages.${system}.version;
}); });
# Add dependencies that are only needed for development # Add dependencies that are only needed for development
devShells = forAllSystems (system: devShells = forAllSystems (system: let
let
pkgs = nixpkgsFor.${system}; pkgs = nixpkgsFor.${system};
in in {
{
default = pkgs.mkShell { default = pkgs.mkShell {
buildInputs = with pkgs; [go gopls gotools go-tools]; buildInputs = with pkgs; [go gopls gotools go-tools];
}; };
......
project.nix 0 → 100644
+ 10
− 0
View file @ 6cae56ec
{
name = "Version";
mnemonic = "version";
description = "Manage version information";
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/utilities/version";
version = "0.1.7";
vendorHash = "sha256-uyWI6Gnko1J62XDk6jjRdqZ8TSFtwsTOlDwdR9Xc+ic=";
}
source/commandline.go
+ 2
− 1
View file @ 6cae56ec
...@@ -34,6 +34,7 @@ type commandLineOptions struct { ...@@ -34,6 +34,7 @@ type commandLineOptions struct {
ExitCode bool `short:"e" long:"exit-code-if-no-bump" description:"exit code to use if no notable changes are found"` ExitCode bool `short:"e" long:"exit-code-if-no-bump" description:"exit code to use if no notable changes are found"`
} `command:"auto" description:"check the git repository and increase the version if necessary. This implies --git"` } `command:"auto" description:"check the git repository and increase the version if necessary. This implies --git"`
Predict struct { Predict struct {
ExitCode bool `short:"e" long:"exit-code-if-no-bump" description:"exit code to use if no notable changes are found"`
} `command:"predict" description:"predict the next version based on the git history. This implies --git"` } `command:"predict" description:"predict the next version based on the git history. This implies --git"`
Print struct { Print struct {
} `command:"print" description:"print the current version, you can combine this with --git to print the last tag"` } `command:"print" description:"print the current version, you can combine this with --git to print the last tag"`
...@@ -188,7 +189,7 @@ func executeCommand() { ...@@ -188,7 +189,7 @@ func executeCommand() {
exitCode := 0 exitCode := 0
printMessage := true printMessage := true
if arguments.Auto.ExitCode { if arguments.Auto.ExitCode || arguments.Predict.ExitCode {
if !arguments.Verbose { if !arguments.Verbose {
printMessage = false printMessage = false
......
treefmt.toml 0 → 120000
+ 1
− 0
View file @ 6cae56ec
/nix/store/7fz761spzs45g2kdvpa6fk9j21slwmdv-Taskfile.yaml
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment