ducoterra
4ee4b7cefb
Add make pull-minecraft
...
Add command to update minecraft project subtree.
2021-11-02 11:56:41 -04:00
ducoterra
6f553df13c
Merge commit '99c243e9cdbe95f4439463500b6797e9ae6d7f17'
2021-11-01 22:44:14 -04:00
ducoterra
99c243e9cd
Merge update from Common
2021-11-01 22:42:01 -04:00
ducoterra
2e7d3a2708
Don't stash on make-update
...
Make the developer handle their own stash. It's such a pain.
2021-11-01 22:16:05 -04:00
ducoterra
05a22bfe3b
Don't make-update after make-push
2021-11-01 21:47:00 -04:00
ducoterra
25ce278d58
Merge commit 'c747403ac42d6deb0c10863962ff630e438423ce'
2021-11-01 21:46:06 -04:00
ducoterra
87731ffd6e
fixup into add git-release
2021-11-01 21:45:16 -04:00
ducoterra
2396536013
Add $(VERSION) var
...
Add variable for the version.
2021-11-01 21:42:14 -04:00
ducoterra
5ccfcf6b5a
Add make git-release
...
Add git-release command that will add everything not currently staged,
create a commit, and tag it with the current version.
2021-11-01 21:41:30 -04:00
ducoterra
8c5d99ae3e
Update docker-release with buildx commands
...
Build for the local arch but push for amd64 and arm64. Use the custom
container-builder buildx platform. Also update the docker-compose file
on release.
2021-11-01 21:41:24 -04:00
ducoterra
3e472ebe86
Add docker-release
...
Add VERSION variable for use with docker-release. Creates a new docker
image automatically and a commit to go with it.
2021-11-01 20:55:16 -04:00
ducoterra
13a4740c14
Merge commit '13085be69aa1b30274f07c210042025395b9ccfd'
2021-11-01 20:42:52 -04:00
ducoterra
13085be69a
Squashed '.gitlab/' changes from b07a2c0..9eed509
...
9eed5099eed50962c
2021-11-01 20:42:52 -04:00
ducoterra
9eed50962c
Don't squash on pull
...
Don't squash updates on pull
2021-11-01 20:32:27 -04:00
ducoterra
446da1ff0e
Merge commit '9095d7d0b0b2be73012a0714bf0b65b1e6adc50e'
2021-11-01 10:07:09 -04:00
ducoterra
ece42df00c
erge commit '04243dc35a266039ab7e4fb6677f23efab8350a2'
2021-11-01 10:06:11 -04:00
ducoterra
04243dc35a
Squashed '.gitlab/' changes from 22a952d..b07a2c0
...
b07a2c0b07a2c095b
2021-11-01 10:06:11 -04:00
ducoterra
b07a2c095b
Run update after make-push
...
To close things out we should re-run make-update to ensure changes are
pulled back into the repo we updated from.
2021-11-01 10:05:43 -04:00
ducoterra
a4d2e1f8fe
Run update after make-push
...
To close things out we should re-run make-update to ensure changes are
pulled back into the repo we updated from.
2021-11-01 10:05:43 -04:00
ducoterra
e7b07c7f84
Squashed '.gitlab/' changes from 2f76759..22a952d
...
22a952d0f6eeb7f81d846afed93f6239af722a952dd53
2021-11-01 10:05:13 -04:00
ducoterra
44b2766509
Merge commit 'e7b07c7f84dae74fc3442953db7585140efa8c6c'
2021-11-01 10:05:13 -04:00
ducoterra
22a952dd53
Remove warning from make-update
...
make-update isn't as destructive as it once was. It should be safe to
run as long as the developer is fixes any weird merge conflicts after
stash pop.
2021-11-01 10:02:35 -04:00
ducoterra
57285aba52
Remove warning from make-update
...
make-update isn't as destructive as it once was. It should be safe to
run as long as the developer is fixes any weird merge conflicts after
stash pop.
2021-11-01 10:02:35 -04:00
ducoterra
0f6eeb776e
Add make-stash-drop command
...
Sometimes you can get stuck in a loop where git stash pop preserves the
stash commit. Dropping that commit if it's a STASH commit after an
update is totally fine.
2021-11-01 10:01:12 -04:00
ducoterra
d9d1c75126
Add make-stash-drop command
...
Sometimes you can get stuck in a loop where git stash pop preserves the
stash commit. Dropping that commit if it's a STASH commit after an
update is totally fine.
2021-11-01 10:01:12 -04:00
ducoterra
f81d846f31
Only pop stash if changes
...
Only pop the stash if the most recent stash commit matches the STASH
name.
2021-11-01 09:56:37 -04:00
ducoterra
1849624763
Only pop stash if changes
...
Only pop the stash if the most recent stash commit matches the STASH
name.
2021-11-01 09:56:37 -04:00
ducoterra
afed93f58a
Add warning to make-update and make-push
...
Add warning before make-update and make-push to alert developers that
running the commands might be destructive. Allow cancelling the command
up to 3 seconds before continuing. Also explain that merge conflicts
warrant a re-run of the command.
2021-11-01 09:38:00 -04:00
ducoterra
d9024f0847
Add warning to make-update and make-push
...
Add warning before make-update and make-push to alert developers that
running the commands might be destructive. Allow cancelling the command
up to 3 seconds before continuing. Also explain that merge conflicts
warrant a re-run of the command.
2021-11-01 09:38:00 -04:00
ducoterra
a9fbe159de
Merge commit '3041d56ba60133f724bfe37dfc9f6730dfc809b8'
2021-11-01 09:27:24 -04:00
ducoterra
3041d56ba6
Squashed '.gitlab/' changes from 66b4fdb..2f76759
...
2f767592f767593ef
2021-11-01 09:26:53 -04:00
ducoterra
6239af7f74
Ignore git stash pop failures
...
In the event the stash is empty, don't run stash pop.
2021-11-01 09:23:36 -04:00
ducoterra
669e95a9f1
Ignore git stash pop failures
...
In the event the stash is empty, don't run stash pop.
2021-11-01 09:23:36 -04:00
ducoterra
e5120ae618
Squashed '.gitlab/' changes from da69418..66b4fdb
...
66b4fdb66b4fdb902
2021-11-01 09:20:16 -04:00
ducoterra
b7271796e2
Merge commit 'e5120ae618292da2cc90ebdc35e61c77a9f66258'
2021-11-01 09:20:16 -04:00
ducoterra
2f767593ef
Add make-push command
...
Add command to update the subtree from a child repo. This pushes to the
main branch of the common repo with only the relevant commits.
2021-11-01 09:20:11 -04:00
ducoterra
3b8bbd3d1f
Add make-push command
...
Add command to update the subtree from a child repo. This pushes to the
main branch of the common repo with only the relevant commits.
2021-11-01 09:20:11 -04:00
ducoterra
66b4fdb902
Ignore subtree pull failures
...
Rather than potentially leaving the developer in a state where `git
stash pop` wasn't run, ignore failures in git subtree and let the
developer fix issues and re-run the command. This makes `make-update`
more idempotent.
2021-11-01 09:13:15 -04:00
ducoterra
858ac5f132
Ignore subtree pull failures
...
Rather than potentially leaving the developer in a state where `git
stash pop` wasn't run, ignore failures in git subtree and let the
developer fix issues and re-run the command. This makes `make-update`
more idempotent.
2021-11-01 09:13:15 -04:00
ducoterra
dd39e3335a
Squashed '.gitlab/' changes from ba12c92..da69418
...
da69418da69418b0d
2021-11-01 09:05:55 -04:00
ducoterra
052b8f836c
Merge commit 'dd39e3335a3a92c34c86ef296c2cc651d8d3afa8'
2021-11-01 09:05:55 -04:00
ducoterra
1abb62322c
Merge commit '07d08a3dd627080ae3dc2eab72554850b4ca7338'
2021-10-31 22:57:41 -04:00
ducoterra
da69418b0d
Switch to url-based subtree with make-update
...
Add new `make-update` make command to update the .gitlab subtree.
2021-10-31 22:56:47 -04:00
ducoterra
533715966c
Merge commit '10fe997cbae7b18fa306fbfb6bb0543b91a3c340' as '.gitlab'
2021-10-31 22:53:01 -04:00
ducoterra
fda8323c19
switch to no remote
2021-10-31 22:52:46 -04:00
ducoterra
3d29d92f8a
Squashed '.gitlab/' changes from 8a52a21..ba12c92
...
ba12c9274a4a4e3e8ca714146777ba12c923ba
2021-10-31 21:04:21 -04:00
ducoterra
efc5f3271c
Merge commit '3d29d92f8aee30354fb3d468285de4b6641e2a17'
2021-10-31 21:04:21 -04:00
ducoterra
34be418006
Include .gitlab Makefile
2021-10-31 21:00:17 -04:00
ducoterra
1cb23265fd
Merge commit 'ba12c923ba6644e8aadcc18b33feaacf61a8fb43'
2021-10-31 21:00:07 -04:00
ducoterra
ba12c923ba
Remove docker-run
...
Docker-run was only useful in very specific projects. Projects should
either define their own "run" in their Makefile, add a
docker-compose.yaml, or specify instructions in the README.
2021-10-31 20:59:29 -04:00
