Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
include pgxntool/base.mk

# origin is the jnasbyupgrade fork, not the canonical repo -- point tag/dist
# at the real remote explicitly instead of relying on whoever runs `make tag`
# to remember (see pgxntool#53).
PGXN_REMOTE = upstream

# Temporary hack
testdeps: $(wildcard test/*/*.sql) $(wildcard test/*.sql) # Be careful not to include directories in this

Expand Down
16 changes: 8 additions & 8 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,14 @@ it's worth a direct look before relying on it.
"Untracked changes!" on a dirty tree.
- [ ] `make tag` — creates a git tag named exactly the DISTRIBUTION version,
UNPREFIXED (e.g. `1.0.0`, no `v` prefix), taken from `PGXNVERSION`, and pushes
it to `origin`. **Make sure `origin` in your checkout actually points at the
real upstream repo, not a personal fork.** If this project has used a
different release-tracking scheme before (release branches, no tracking at
all, etc.), `make tag` is the sole mechanism going forward once migrated. It's
idempotent when the tag already points at HEAD, and errors if the tag exists
on a different commit. To move an existing tag use `make forcetag`
(= `make rmtag` then `make tag`); `make rmtag` deletes the tag locally and on
`origin`.
it to `upstream` (this project's `Makefile` sets `PGXN_REMOTE = upstream`,
since `origin` here is the `jnasbyupgrade` fork, not the canonical repo — see
pgxntool#53). If this project has used a different release-tracking scheme
before (release branches, no tracking at all, etc.), `make tag` is the sole
mechanism going forward once migrated. It's idempotent when the tag already
points at HEAD, and errors if the tag exists on a different commit. To move
an existing tag use `make forcetag` (= `make rmtag` then `make tag`);
`make rmtag` deletes the tag locally and on `upstream`.
- [ ] `make dist` — depends on `tag` (and builds the HTML docs), then
`git archive`s the tag into a distribution zip in the parent directory.
Because it archives the tag, only committed files are included. If a
Expand Down
Loading