diff --git a/.task/checksum/build b/.task/checksum/build
index 200ae2df5b71ba2dd7d559f2027f5fa034ee46ec..7e73d6a9e915f39fd04904ccb8bdfdedfe5ad02f 100644
--- a/.task/checksum/build
+++ b/.task/checksum/build
@@ -1 +1 @@
-ada4113a83f16545fc633034da83fe21
+edb69574a550b43e78b5a00620ffb306
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 35b91fbe4f24363f6415f7a01037003f9c8dd1a2..0000000000000000000000000000000000000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,27 +0,0 @@
-
-<a name="v0.3.0"></a>
-## [v0.3.0] - 2022-12-27
-### Add Features
-- flag for change data name
-- new export
-
-### Bug Fixes
-- dont parse script or styles
-- parse only html pages
-- insert node error
-
-
-<a name="v0.2.0"></a>
-## v0.2.0 - 2022-12-27
-### Add Features
-- add a function to keep parts of a structure.
-- implement cut, sync and template
-
-### Changes
-- complete documentation
-- update libs
-- update makefiles
-- project sturcture
-
-
-[v0.3.0]: https://gitlab.schukai.com/oss/bob/compare/v0.2.0...v0.3.0
diff --git a/devenv.lock b/devenv.lock
index d0cc358b96ca4c0b4d421de4f24744bcb4809268..7af6aa28e34e3ad2e193a277c778ad72ce2f4fe6 100644
--- a/devenv.lock
+++ b/devenv.lock
@@ -3,11 +3,11 @@
"devenv": {
"locked": {
"dir": "src/modules",
- "lastModified": 1690413082,
- "narHash": "sha256-CPR3WcnrrIiDZJiMo4RlyZB0M3576pHmtlTUnMUTugA=",
+ "lastModified": 1690570337,
+ "narHash": "sha256-AO9S5hi/8XINL3fDich0YOh6dgUse4/GshebUA8xCXs=",
"owner": "cachix",
"repo": "devenv",
- "rev": "148c4a21e50428728e97f3cdf59166b6007db8a7",
+ "rev": "7b3127f288ca732ef88db0ebc413996f4366a33f",
"type": "github"
},
"original": {
@@ -74,11 +74,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1690470004,
- "narHash": "sha256-l57RmPhPz9r1LGDg/0v8bYgJO8R+GGTQZtkIxE7negU=",
+ "lastModified": 1690558459,
+ "narHash": "sha256-5W7y1l2cLYPkpJGNlAja7XW2X2o9rjf0O1mo9nxS9jQ=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "9462344318b376e157c94fa60c20a25b913b2381",
+ "rev": "48e82fe1b1c863ee26a33ce9bd39621d2ada0a33",
"type": "github"
},
"original": {
@@ -106,11 +106,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1690470004,
- "narHash": "sha256-l57RmPhPz9r1LGDg/0v8bYgJO8R+GGTQZtkIxE7negU=",
+ "lastModified": 1690558459,
+ "narHash": "sha256-5W7y1l2cLYPkpJGNlAja7XW2X2o9rjf0O1mo9nxS9jQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "9462344318b376e157c94fa60c20a25b913b2381",
+ "rev": "48e82fe1b1c863ee26a33ce9bd39621d2ada0a33",
"type": "github"
},
"original": {
@@ -130,11 +130,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1690464206,
- "narHash": "sha256-38V4kmOh6ikpfGiAS+Kt2H/TA2DubSqE66veP/jmB4Q=",
+ "lastModified": 1690628027,
+ "narHash": "sha256-OTSbA2hM6VmxyZ/4siYPANffMBzIsKu04GLjXcv8ST0=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "9289996dcac62fd45836db7c07b87d2521eb526d",
+ "rev": "1e2443dd3f669eb65433b2fc26a3065e05a7dc9c",
"type": "github"
},
"original": {
@@ -171,11 +171,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
- "lastModified": 1689724337,
- "narHash": "sha256-cWg/RVao310yNZnvtiyxl3INOECmHtabQo5Uq2a7Qpg=",
+ "lastModified": 1690636943,
+ "narHash": "sha256-o+s7qlz/B4Qm1FwxHBKSehueHiN63lhLw/9ECj395yE=",
"ref": "refs/heads/master",
- "rev": "aa4874d1138ca8f573c23fdaf8978b91477ea28a",
- "revCount": 28,
+ "rev": "8ec3b15207aab0070eb5f1a7a0707f6d09cb2bff",
+ "revCount": 30,
"type": "git",
"url": "https://gitlab.schukai.com/oss/utilities/version.git"
},
diff --git a/devenv.nix b/devenv.nix
index d4249b9f993a4ba3ae7cad3c4bc161431014de5d..a2384e65f6d76d23ac1e7232ab44f39b16d79aaa 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -3,14 +3,15 @@
{
+
env.LD_LIBRARY_PATH = lib.makeLibraryPath [ ];
+ env.APP_NAME = "bob";
# https://devenv.sh/packages/
packages = [
inputs.version.defaultPackage."${builtins.currentSystem}"
pkgs.git
pkgs.gcc12
- #pkgs.glibc
pkgs.go-task
pkgs.blackbox
pkgs.blackbox-terminal
@@ -26,22 +27,16 @@
pkgs.ranger
pkgs.meld
pkgs.gnused
- pkgs.coreutils-full # # https://search.nixos.org/packages?channel=23.05&show=coreutils-full&from=0&size=50&sort=relevance&type=packages&query=mkdir
+ pkgs.coreutils-full
pkgs.gnugrep
pkgs.gnumake
pkgs.util-linux
- # pkgs.logrotate
pkgs.httpie
pkgs.netcat
pkgs.memcached
- pkgs.fd
-
- #pkgs.process-compose
- # pkgs.glibc_multi
- # pkgs.curl
+ pkgs.fd
];
- ## curl geht nicht!
# https://devenv.sh/languages/
# languages.nix.enable = true;
@@ -108,11 +103,21 @@ pgrep() {
export -f pgrep
-set -x
+version() {
+ ${inputs.version.defaultPackage."${builtins.currentSystem}"}/bin/version "$@"
+}
-version=''$(git describe --tags --always --dirty)
-buildDate=''$(date -u +"%Y-%m-%dT%H:%M:%SZ")
+export -f version
+set -x
+
+if [ -z "'CI_JOB_TOKEN" ]; then
+ version=''$(git describe --tags --always --dirty)
+ buildDate=''$(date -u +"%Y-%m-%dT%H:%M:%SZ")
+else
+ version=''$(version predict)
+ buildDate=''$(version date)
+fi
${config.devenv.root}/bin/go-compile.sh \
"${config.devenv.root}/source/" \
@@ -125,8 +130,6 @@ ${config.devenv.root}/bin/go-compile.sh \
'';
-
-
# This scritp is used to deploy the app to the gitlab registry
# It is used by the gitlab-ci.yml file
# The environment variables are set in the gitlab project settings
@@ -237,6 +240,7 @@ fi
git --no-pager log --decorate=short --pretty=oneline
+## the version should be the same as in the build task
if ! version auto --git --verbose
then
echo "ERROR: Could not update version."
@@ -246,31 +250,15 @@ fi
git --no-pager log --decorate=short --pretty=oneline
gitVersion=$(version print --git)
-packageJsonFile=''${project_root}package.json
-
-app_name=$(jq -r '.name' ''${packageJsonFile})
-jq ".version = \"''${gitVersion}\"" ''${packageJsonFile} | sponge ''${packageJsonFile}
-
-archiveFile="''${project_root}''${app_name}-''${gitVersion}.tar.gz"
-tar -C ''${project_root}dist -czf ''${archiveFile} .
-
-curl -v --insecure -H "JOB-TOKEN: ''${CI_JOB_TOKEN}" --upload-file \
- ''${archiveFile} \
- https://gitlab.schukai.com/api/v4/projects/''${CI_PROJECT_ID}/packages/generic/''${app_name}/''${gitVersion}/''${app_name}.tar.gz
-
-rm ''${archiveFile}
+for files in $(ls "''${project_root}"dist/*); do
+ curl -v --insecure -H "JOB-TOKEN: ''${CI_JOB_TOKEN}" --upload-file \
+ ''${archiveFile} \
+ https://gitlab.schukai.com/api/v4/projects/''${CI_PROJECT_ID}/packages/generic/''${APP_NAME}/''${gitVersion}/''${file}
+done
-# Check if the file has changes
-if [[ -n $(git status --porcelain "''${packageJsonFile}") ]]; then
- echo "Changes found in ''${packageJsonFile}. Committing..."
- git add "''${packageJsonFile}"
- git commit -m "Bump version to ''${gitVersion}"
- git push -o ci.skip origin ''${CI_COMMIT_REF_NAME} --tags
-else
- echo "No changes found in ''${CI_COMMIT_REF_NAME}. Skipping commit."
-fi
+git push -o ci.skip origin ''${CI_COMMIT_REF_NAME} --tags
echo "done"
diff --git a/release.json b/release.json
deleted file mode 100644
index c4db434202b17605b14f0b02daf95a1296b0cdba..0000000000000000000000000000000000000000
--- a/release.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version":"0.6.2"}