From 471645d24895b8383acff8498b84dd65aab0d9c8 Mon Sep 17 00:00:00 2001 From: n-peugnet Date: Thu, 30 Sep 2021 17:42:43 +0200 Subject: first add of exp and Makefiles --- .github/workflows/build.yml | 4 ++-- Makefile | 36 ++++++++++++++++++++++++++++++++++++ README.md | 8 +++----- exp/.gitignore | 3 +++ exp/Makefile | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 77 insertions(+), 7 deletions(-) create mode 100644 Makefile create mode 100644 exp/.gitignore create mode 100644 exp/Makefile diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d0d89e9..693cf7c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: ${{ runner.os }}-go- - name: Build - run: go build -v ./... + run: make build - name: Test - run: go test -v ./... + run: make test diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..8957aff --- /dev/null +++ b/Makefile @@ -0,0 +1,36 @@ +BIN := dna-backup +SRC := $(shell find . -not \( -path './exp' -prune \) -type f -name '*.go') +V := $(if $(CI),-v) + +# Default installation paths +PREFIX ?= /usr/local +BINDIR = $(DESTDIR)$(PREFIX)/bin + +.PHONY: all +all: build + +.PHONY: build +build: $(BIN) + +$(BIN): $(SRC) + go build $V -o $@ + +.PHONY: clean +clean: + rm -rf $(BIN) + +.PHONY: test +test: + go test $V ./... + +.PHONY: exp +exp: + $(MAKE) -C $@ + +.PHONY: install +install: $(BIN) + install -D $(BIN) $(BINDIR) + +.PHONY: uninstall +uninstall: + -rm -f $(BINDIR)/$(BIN) diff --git a/README.md b/README.md index d246465..0f8a500 100644 --- a/README.md +++ b/README.md @@ -142,8 +142,6 @@ des _chunks_ de ce fichier. ## Build instructions -_Classical go_ - ### Requirements - Go >= 1.16 @@ -152,13 +150,13 @@ _Classical go_ ```bash # Build -go build +make # Test -go test ./... +make test # Run -go run . +./dna-backup commit ``` [build-img]: https://github.com/n-peugnet/dna-backup/actions/workflows/build.yml/badge.svg diff --git a/exp/.gitignore b/exp/.gitignore new file mode 100644 index 0000000..a0991ff --- /dev/null +++ b/exp/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!Makefile diff --git a/exp/Makefile b/exp/Makefile new file mode 100644 index 0000000..37fa8c8 --- /dev/null +++ b/exp/Makefile @@ -0,0 +1,33 @@ +REPO_URL := https://club1.fr/~nicolas/git/dna-backup/ + +REPO_PATH := repo +GIT_PATH := git +GITC := git -C $(REPO_PATH) + +BIN_PATH := .. + +.PHONY: apply +apply: commits ../dna-backup + cat $< | while read i; do \ + $(GITC) checkout `echo "$$i" | cut -f1`; \ + done + +$(BIN_PATH)/dna-backup: .FORCE + $(MAKE) -C $(BIN_PATH) dna-backup + +commits: Makefile repo git + $(GITC) log --reverse --no-merges --pretty=tformat:"%H %as" \ + | sort --unique --key=2 \ + > $@ + +repo git: + git clone --separate-git-dir=$(GIT_PATH) $(REPO_URL) $(REPO_PATH) +# remove warning about detached head state + $(GITC) config advice.detachedHead false + +.PHONY: clean +clean: + rm -rf $(REPO_PATH) $(GIT_PATH) + rm -f commits + +.FORCE: ; -- cgit v1.2.3