diff --git a/.gitignore b/.gitignore index 7a86e75..360f312 100644 --- a/.gitignore +++ b/.gitignore @@ -1,36 +1,3 @@ -# Binaries for programs and plugins -*.exe -*.exe~ -*.dll -*.so -*.dylib -bin - -# Test binary, build with `go test -c` -*.test - -# Output of the go coverage tool, specifically when used with LiteIDE -*.out - -# Kubernetes Generated files - skip generated files, except for vendored files - -!vendor/**/zz_generated.* -vendor/ - -# editor and IDE paraphernalia -.idea -*.swp -*.swo -*~ -.vscode/ -testbin/ -dev/ - -# direnv .direnv - -# pre-commit -.pre-commit-config.yaml - -tmp/ -deep-docs/ +example/common.mk +example/bin/ diff --git a/example/Makefile b/example/Makefile index b78ebef..4279f37 100644 --- a/example/Makefile +++ b/example/Makefile @@ -2,7 +2,8 @@ DEV_KIT_VERSION := v1.0.0 -include common.mk common.mk: - curl -sSL https://raw.githubusercontent.com/opendefensecloud/dev-kit/$(DEV_KIT_VERSION)/common.mk -o $@ + curl --fail -sSL https://raw.githubusercontent.com/opendefensecloud/dev-kit/$(DEV_KIT_VERSION)/common.mk -o common.mk.download && \ + mv common.mk.download $@ # Add you own custom make targets my-target: diff --git a/example/flake.nix b/example/flake.nix index 7625847..ffb4809 100644 --- a/example/flake.nix +++ b/example/flake.nix @@ -3,16 +3,19 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; go-overlay = { url = "github:purpleclay/go-overlay"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; }; dev-kit = { url = "github:opendefensecloud/dev-kit"; inputs.nixpkgs.follows = "nixpkgs"; inputs.go-overlay.follows = "go-overlay"; + inputs.flake-utils.follows = "flake-utils"; }; }; diff --git a/example/renovate.json b/example/renovate.json index c675ec4..6b09344 100644 --- a/example/renovate.json +++ b/example/renovate.json @@ -10,10 +10,10 @@ "tools.lock" ], "matchStrings": [ - "(?[^\\s]+) (?[^@]+@v?[^\\s]+)" + "(?[^\\s]+) (?[^@]+)@(?v?[^\\s]+)" ], - "depNameTemplate": "go", - "versioningTemplate": "semver" + "versioningTemplate": "semver", + "datasourceTemplate": "go" } ], "ignorePaths": [] diff --git a/flake.nix b/flake.nix index 0327a18..c2e142d 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "odc development environment"; + description = "dev-kit"; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";