services/Common
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'make-update-fixes' into 'main'

Browse Source 
Update README with "common" remote

See merge request services/common!4
This commit is contained in:
Reese
2021-11-02 15:50:30 +00:00
parent 30fb8c2171 c3e6d733c6
commit 731ada6a3d
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@@ -1,6 +1,8 @@
SHELL := /bin/bash SHELL := /bin/bash
IMAGE ?= $(shell cat IMAGE):$(shell cat VERSION) PROJECT_NAME ?= $(shell git config --local remote.origin.url|sed -n 's#.*/\([^.]*\)\.git#\1#p')
VERSION ?= $(shell cat VERSION)
IMAGE ?= $(shell cat IMAGE):$(VERSION)
IMAGE_LATEST ?= $(shell cat IMAGE):latest IMAGE_LATEST ?= $(shell cat IMAGE):latest
PWD ?= $(shell pwd) PWD ?= $(shell pwd)
STASH ?= "common-update-stash" STASH ?= "common-update-stash"
@@ -23,14 +25,10 @@ make-stash-drop:
.PHONY: make-update .PHONY: make-update
make-update: make-update:
@git stash save $(STASH) @git subtree pull --prefix .gitlab --message "Merge update from Common" -q common main
-git subtree pull --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main
@if [ ! -z "$$(git stash list | grep -r 'stash@{0}.*common')" ]; then git stash pop; fi
.PHONY: make-push .PHONY: make-push
make-push: warning make-push: warning
@make make-update @make make-update
@git remote add common git@gitlab.ducoterra.net:services/common.git @git subtree split --branch common/$(PROJECT_NAME) --prefix .gitlab
@git subtree push --prefix .gitlab common main @git push common common/$(PROJECT_NAME):common/$(PROJECT_NAME)
@git remote remove common
@make make-update

3
README.md
View File

@@ -2,7 +2,8 @@
```bash ```bash
# Add the subtree as a remote # Add the subtree as a remote
git subtree add --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main --squash git remote add common git@gitlab.ducoterra.net:services/common.git
git subtree add --prefix .gitlab common main
# Now you can run the following to update # Now you can run the following to update
make make-update make make-update