ducoterra
9863a1195a
Merge commit '2de53def190d3a424323f76d4bc08e84717a3a0c'
2021-11-02 12:52:20 -04:00
ducoterra
2de53def19
Remove .common
2021-11-02 12:46:40 -04:00
ducoterra
a85a7aa84f
Merge branch 'common-subtree'
2021-11-02 12:45:47 -04:00
ducoterra
a07400506a
Add '.gitlab/' from commit '731ada6a3d65b2347ccf204cfe09ee278a4f0594'
...
git-subtree-dir: .gitlab
git-subtree-mainline: 422f4d49bd731ada6a3d
2021-11-02 11:59:31 -04:00
ducoterra
422f4d49bd
remove .gitlab subtree
2021-11-02 11:59:08 -04:00
ducoterra
d580f3407c
Merge update from Common
2021-11-02 11:57:26 -04:00
ducoterra
4ee4b7cefb
Add make pull-minecraft
...
Add command to update minecraft project subtree.
2021-11-02 11:56:41 -04:00
Reese
731ada6a3d
Merge branch 'make-update-fixes' into 'main'
...
Update README with "common" remote
See merge request services/common!4
2021-11-02 15:50:30 +00:00
ducoterra
c3e6d733c6
Switch to "subtree split" push strategy
...
Split the subtree into a new branch before pushing to common. This
creates a new branch automatically and ensures no weird histories get
committed to common.
2021-11-02 11:48:15 -04:00
ducoterra
3c91292fea
Make user stash their own damn changes
...
Stashing is so annoying to deal with in a scripted way. Just force the
user to stash their own changes. Only subtree pull if it's possible.
2021-11-02 11:47:29 -04:00
ducoterra
d86b5052a8
Add PROJECT_NAME and VERSION
...
Add PROJECT_NAME and VERSION variables to Makefile.
2021-11-02 11:46:53 -04:00
ducoterra
9d0c9c6388
Update README with "common" remote
...
Add instructions for adding subtree using a remote called "common". You
need the remote to properly contribute back upstream from a child
project.
2021-11-02 11:45:57 -04:00
Reese
30fb8c2171
Merge branch 'docker-buidlx-overhaul' into 'main'
...
Switch to container-builder buildx platform
See merge request services/common!2
2021-11-02 15:44:36 +00:00
Reese
fd96b3f3a3
Merge branch 'git-release' into 'main'
...
Add make git-release
See merge request services/common!3
2021-11-02 15:44:26 +00:00
ducoterra
a6053ed3f0
Add make git-release
...
Add command which makes an automated release from the VERSION file.
Commits and tags everything not staged in the repo.
2021-11-02 10:25:18 -04:00
ducoterra
3563c5c2aa
Add make docker-release
...
Add docker-release command which updates the image tag in the
docker-compose.yaml and runs a `make push`.
2021-11-02 10:23:53 -04:00
ducoterra
40a217b585
Use buildx to create multi-arch images
...
clear and set the buildx context on push. Then use --push with buildx
build to push the multi-arch images immediately after creating them.
This gets around the need to store them locally (which won't work for
something like an M1 mac).
2021-11-02 10:22:48 -04:00
ducoterra
5e2bc5f872
Switch to container-builder buildx platform
...
Continue using buildx with a new container builder name
"container-builder".
2021-11-02 10:19:21 -04:00
ducoterra
a5aa0cacbe
Automated release for version 1.0.2
2021-11-02 10:08:38 -04:00
ducoterra
65b3a84e96
make subtree "split" overhaul
...
In order to create cleaner histories we should be using subtree split
and push in order to preview the changes as an MR before pushing to
main.
2021-11-02 10:07:50 -04:00
ducoterra
d181d452e8
Overhaul for get-server v. 2.0.0
...
Since get-server downloads its own jarfile this commit overhauls a lot
of the minecraft deploy to match the new strategy. It also updates the
README and adds makefile targets for a few new commands.
2021-11-02 10:05:01 -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
