]>
granicus.if.org Git - graphviz/log
Matthew Fernandez [Sun, 14 Feb 2021 18:27:02 +0000 (10:27 -0800)]
remove use of regex for parsing SVG attributes
Related to #1919.
Matthew Fernandez [Sun, 14 Feb 2021 17:43:25 +0000 (09:43 -0800)]
add a test of user shapes
Matthew Fernandez [Sat, 20 Feb 2021 23:41:55 +0000 (23:41 +0000)]
Merge branch 'smattr/
005D38E6 -E842-4522-B368-
616652003649 ' into 'master'
fix HTML validation errors
Closes #1861
See merge request graphviz/graphviz!1758
Matthew Fernandez [Sun, 14 Feb 2021 22:05:19 +0000 (14:05 -0800)]
fix HTML validation errors in graphviz.html
Fixes #1861.
Matthew Fernandez [Sun, 14 Feb 2021 22:02:41 +0000 (14:02 -0800)]
fix HTML validation errors in types.html
Related to #1861.
Matthew Fernandez [Sun, 14 Feb 2021 21:38:47 +0000 (13:38 -0800)]
fit HTML validation errors in internal_todo.html
Related to #1861.
Matthew Fernandez [Sun, 14 Feb 2021 21:37:06 +0000 (13:37 -0800)]
fix validation error in shapes.html
Related to #1861.
Matthew Fernandez [Sun, 14 Feb 2021 21:26:49 +0000 (13:26 -0800)]
remove use of XMP tags in HTML
The XMP tag was deprecated for PRE [0]. Related to #1861.
[0]: https://html.spec.whatwg.org/multipage/obsolete.html#non-conforming-features
Matthew Fernandez [Sun, 14 Feb 2021 21:14:08 +0000 (13:14 -0800)]
fix invalid HTML in colors.html
Related to #1861.
Matthew Fernandez [Sat, 20 Feb 2021 23:05:50 +0000 (23:05 +0000)]
Merge branch 'smattr/
def8873c -a3d8-4ea5-bf26-
094a7b2f1f5c ' into 'master'
remove use of NiL in favor of NULL, and some other clean up
See merge request graphviz/graphviz!1755
Matthew Fernandez [Sun, 14 Feb 2021 17:03:17 +0000 (09:03 -0800)]
silence some -Wimplicit-fallthrough warnings
Matthew Fernandez [Sun, 14 Feb 2021 16:56:05 +0000 (08:56 -0800)]
remove NiL and use the standard library's NULL
There's no need for us to roll our own NULL substitute.
Matthew Fernandez [Sun, 14 Feb 2021 16:51:20 +0000 (08:51 -0800)]
remove commented out exconvert()
Mark Hansen [Sat, 20 Feb 2021 22:28:41 +0000 (22:28 +0000)]
Merge branch 'ci5' into 'master'
Revert "Only run macOS CI on graphviz/graphviz repo"
See merge request graphviz/graphviz!1785
Mark Hansen [Sat, 20 Feb 2021 22:07:19 +0000 (09:07 +1100)]
Revert "Only run macOS CI on graphviz/graphviz repo"
This reverts commit
5052447d34a37421282b8eb5a9677097518b86b7 .
Matthew Fernandez [Sat, 20 Feb 2021 16:29:21 +0000 (16:29 +0000)]
Merge branch 'smattr/
08168fc6 -58f9-44ca-845e-
9d35bd3b7699 ' into 'master'
clean up and bug fixes in libmingle
Closes #1938
See merge request graphviz/graphviz!1754
Matthew Fernandez [Sun, 14 Feb 2021 06:24:06 +0000 (22:24 -0800)]
remove useless comment
Matthew Fernandez [Sun, 14 Feb 2021 06:14:12 +0000 (22:14 -0800)]
replace header guards in mingle with more modern #pragma once
Matthew Fernandez [Sun, 14 Feb 2021 06:08:22 +0000 (22:08 -0800)]
fix memory leak in ANN bridge
Matthew Fernandez [Sun, 14 Feb 2021 06:02:54 +0000 (22:02 -0800)]
push some definitions closer to where they are used
Matthew Fernandez [Sun, 14 Feb 2021 05:56:05 +0000 (21:56 -0800)]
condense and simplify sorting code in ANN bridge
Related to #1938.
Matthew Fernandez [Sun, 14 Feb 2021 05:38:09 +0000 (21:38 -0800)]
remove useless inner loop in ANN bridge
Iterations after the first pass were no-ops. Closes #1938.
Matthew Fernandez [Sun, 14 Feb 2021 05:36:37 +0000 (21:36 -0800)]
mark dimension as a constant in ANN bridge
Related to #1938.
Matthew Fernandez [Sun, 14 Feb 2021 05:33:19 +0000 (21:33 -0800)]
remove unnecessary cast
Matthew Fernandez [Sun, 14 Feb 2021 05:32:00 +0000 (21:32 -0800)]
remove the ability to pass a dimension to ANN code
Internally this assumed dim == 4, so passing in a different value would result
in incorrect answers. Related to #1938.
Matthew Fernandez [Sun, 14 Feb 2021 05:24:09 +0000 (21:24 -0800)]
#include nearest_neighbor_graph_ann.h to avoid duplicating a prototype
Matthew Fernandez [Sun, 14 Feb 2021 05:20:25 +0000 (21:20 -0800)]
make nearest_neighbor_graph_ann.h #includable from C++
Mark Hansen [Sat, 20 Feb 2021 07:59:25 +0000 (07:59 +0000)]
Merge branch 'ci5' into 'master'
Only run macOS CI on graphviz/graphviz repo
Closes #1951
See merge request graphviz/graphviz!1783
Mark Hansen [Sat, 20 Feb 2021 07:35:19 +0000 (18:35 +1100)]
Only run macOS CI on graphviz/graphviz repo
Don't run on forks, which generally don't have access to macOS runners.
Fixes #1951
Mark Hansen [Sat, 20 Feb 2021 07:22:18 +0000 (07:22 +0000)]
Merge branch 'smoosh4' into 'master'
Don't checkout the source code for docker push
See merge request graphviz/graphviz!1782
Mark Hansen [Sat, 20 Feb 2021 07:08:40 +0000 (07:08 +0000)]
Merge branch 'smoosh3' into 'master'
Start building portable source ASAP
See merge request graphviz/graphviz!1781
Mark Hansen [Sat, 20 Feb 2021 07:07:12 +0000 (18:07 +1100)]
Don't checkout the source code for docker push
It's not used and not needed.
This might speed up the CI a little.
Based off
https://blog.callr.tech/building-docker-images-with-gitlab-ci-best-practices/
Mark Hansen [Sat, 20 Feb 2021 06:41:26 +0000 (06:41 +0000)]
Merge branch 'master' into 'master'
Fix docker push live step
See merge request graphviz/graphviz!1780
Mark Hansen [Sat, 20 Feb 2021 06:36:30 +0000 (17:36 +1100)]
Start building portable source ASAP
portable source doesn't need to depend on all previous stages, just the
building of ubuntu 18.04 image
Mark Hansen [Sat, 20 Feb 2021 06:18:40 +0000 (06:18 +0000)]
Merge branch 'master' into 'master'
Allow testing docker_push step in my own repo
See merge request graphviz/graphviz!1778
Mark Hansen [Sat, 20 Feb 2021 06:17:34 +0000 (17:17 +1100)]
Fix docker push live step
Was getting error
```
/bin/bash: line 118: docker: command not found
```
Mark Hansen [Sat, 20 Feb 2021 06:05:37 +0000 (17:05 +1100)]
Allow testing docker_push step in my own repo
With my own container registry
Before, I mistakenly thought that merge requests ran with the
credentials of graphviz/graphviz, now I see they only run with the
credentials of the source repo (markhnsn/graphviz). So it's safe to run
this on any master branch, even forks.
Mark Hansen [Sat, 20 Feb 2021 06:04:45 +0000 (06:04 +0000)]
Merge branch 'smoosh' into 'master'
docker: Split building SHA and pushing to :latest
See merge request graphviz/graphviz!1776
Mark Hansen [Sat, 20 Feb 2021 05:29:12 +0000 (16:29 +1100)]
docker: Split building SHA and pushing to :latest
Previously, we guarded the :latest tag by limiting it to master only,
not merge requests.
Now we need to split this:
- it's safe for merge requests to push to their own SHA, nobody else is
using that SHA
- the merge request tests assume that a docker image is tagged with a
SHA, so the merge request tests require the docker_build step to run.
I'm a bit disappointed I couldn't get this to work in a single step
(hence the undesirable duplication) -- perhaps there's a way to lock
down :latest within a single CI job that I'm missing?
This commit is loosely based off
https://blog.callr.tech/building-docker-images-with-gitlab-ci-best-practices/
Mark Hansen [Sat, 20 Feb 2021 04:45:37 +0000 (04:45 +0000)]
Merge branch 'smoosh' into 'master'
Bugfix: invalid spec
See merge request graphviz/graphviz!1775
Mark Hansen [Sat, 20 Feb 2021 04:44:37 +0000 (15:44 +1100)]
Bugfix: invalid spec
Forgot to capitalize this
Caused:
ERROR: Preparation failed: failed to pull image
"registry.gitlab.com/graphviz/graphviz/:
8437020a9de5bbd812cdc4cb09c94c349366631c "
with specified policies [always]: invalid reference format
(manager.go:205:0s)
Mark Hansen [Sat, 20 Feb 2021 04:34:28 +0000 (04:34 +0000)]
Merge branch 'smoosh' into 'master'
Stop pushing to deprecated per-image tags
See merge request graphviz/graphviz!1774
Mark Hansen [Sat, 20 Feb 2021 04:33:13 +0000 (15:33 +1100)]
Stop pushing to deprecated per-image tags
The tests are now all using separate images rather than tags on the one
image.
Mark Hansen [Sat, 20 Feb 2021 04:25:33 +0000 (04:25 +0000)]
Merge branch 'smoosh' into 'master'
Use Git SHAs fetching build and test docker images
See merge request graphviz/graphviz!1773
Mark Hansen [Sat, 20 Feb 2021 04:24:02 +0000 (15:24 +1100)]
Use Git SHAs fetching build and test docker images
Should fix a race condition on the :latest label
Took the chance to do a bit of deduplication. Not sure if I love the
result, but it does mean there's one place to edit for the schema of the
docker label to use.
Mark Hansen [Sat, 20 Feb 2021 04:12:20 +0000 (04:12 +0000)]
Merge branch 'smoosh' into 'master'
Bugfix: should have been /$IMAGE:latest
See merge request graphviz/graphviz!1772
Mark Hansen [Sat, 20 Feb 2021 04:11:37 +0000 (15:11 +1100)]
Bugfix: should have been /$IMAGE:latest
This was pushing all the different OS images to the top-level
graphviz/graphviz:latest package before.
Mark Hansen [Sat, 20 Feb 2021 04:11:08 +0000 (04:11 +0000)]
Merge branch 'smoosh' into 'master'
No-op: Use CI_IMAGE_REGISTRY variable
See merge request graphviz/graphviz!1771
Mark Hansen [Sat, 20 Feb 2021 04:10:32 +0000 (15:10 +1100)]
No-op: Use CI_IMAGE_REGISTRY variable
Reduces some typing. Expands to the same thing.
Mark Hansen [Sat, 20 Feb 2021 04:03:25 +0000 (04:03 +0000)]
Merge branch 'smoosh' into 'master'
Reuse docker images where possible
See merge request graphviz/graphviz!1770
Mark Hansen [Sat, 20 Feb 2021 04:01:25 +0000 (15:01 +1100)]
Reuse docker images where possible
Should speed up CI docker image building.
Inspiration from
https://blog.callr.tech/building-docker-images-with-gitlab-ci-best-practices/
Mark Hansen [Sat, 20 Feb 2021 03:58:05 +0000 (03:58 +0000)]
Merge branch 'smoosh' into 'master'
Push Docker images to 'latest' tag too
See merge request graphviz/graphviz!1769
Mark Hansen [Sat, 20 Feb 2021 03:57:16 +0000 (14:57 +1100)]
Push Docker images to 'latest' tag too
We'll use this for caching soon
Inspired by
https://blog.callr.tech/building-docker-images-with-gitlab-ci-best-practices/
Mark Hansen [Sat, 20 Feb 2021 03:51:49 +0000 (03:51 +0000)]
Merge branch 'smoosh' into 'master'
Stop docker complaining about password argument
See merge request graphviz/graphviz!1768
Mark Hansen [Sat, 20 Feb 2021 03:50:14 +0000 (14:50 +1100)]
Stop docker complaining about password argument
Fixes this warning:
```
WARNING! Using --password via the CLI is insecure. Use --password-stdin.
```
With thanks to
https://blog.callr.tech/building-docker-images-with-gitlab-ci-best-practices/
for the inspiration.
Mark Hansen [Sat, 20 Feb 2021 03:49:50 +0000 (03:49 +0000)]
Merge branch 'smoosh' into 'master'
Fix error: "docker build" requires exactly 1 argument.
See merge request graphviz/graphviz!1767
Mark Hansen [Sat, 20 Feb 2021 03:49:13 +0000 (14:49 +1100)]
Fix error: "docker build" requires exactly 1 argument.
Oops, forgot the dot last commit.
Mark Hansen [Sat, 20 Feb 2021 03:45:51 +0000 (03:45 +0000)]
Merge branch 'smoosh' into 'master'
Push to git-SHA Docker image label
See merge request graphviz/graphviz!1766
Mark Hansen [Sat, 20 Feb 2021 03:44:31 +0000 (14:44 +1100)]
Push to git-SHA Docker image label
Keep the old image labels for backwards compatibility, just for now
Remove the filename scope: I want this to run every time we push, just
for now. We'll make this faster with caching soon.
Mark Hansen [Sat, 20 Feb 2021 03:39:12 +0000 (03:39 +0000)]
Merge branch 'smoosh' into 'master'
No-op: consolidate Docker Image building YAML
See merge request graphviz/graphviz!1765
Mark Hansen [Sat, 20 Feb 2021 03:36:11 +0000 (14:36 +1100)]
No-op: consolidate Docker Image building YAML
This should have the same effect while making it easier to change the
common docker image building code.
Matthew Fernandez [Wed, 17 Feb 2021 16:09:48 +0000 (16:09 +0000)]
Merge branch 'smattr/
faedcca5 -e012-4920-8e45-
5457d2ff984b ' into 'master'
misc clean up
See merge request graphviz/graphviz!1740
Matthew Fernandez [Thu, 11 Feb 2021 05:33:35 +0000 (21:33 -0800)]
squash some -Wimplicit-fallthrough compiler warnings
Matthew Fernandez [Thu, 11 Feb 2021 04:55:55 +0000 (20:55 -0800)]
remove some unnecessary void* casts
Matthew Fernandez [Thu, 11 Feb 2021 04:39:38 +0000 (20:39 -0800)]
remove our own CHAR_BIT definitions
We can just use those in the C standard library.
Matthew Fernandez [Wed, 17 Feb 2021 03:56:37 +0000 (19:56 -0800)]
Merge branch 'smattr/
150C537B -D311-4C5E-B421-
A4874CE8C5F4 '
Matthew Fernandez [Fri, 12 Feb 2021 02:53:57 +0000 (18:53 -0800)]
add Fedora to the noted list of downstream consumers
Related to #1941.
Matthew Fernandez [Wed, 17 Feb 2021 03:41:19 +0000 (03:41 +0000)]
Merge branch 'smattr/
E488F2BC -9394-4031-AB3D-
A8E6BC313197 ' into 'master'
remove some unnecessary sfstropen use
See merge request graphviz/graphviz!1738
Matthew Fernandez [Sun, 3 Jan 2021 17:27:19 +0000 (09:27 -0800)]
remove another use of sfstropen in GVPR
Related to #1873.
Matthew Fernandez [Sun, 3 Jan 2021 01:54:57 +0000 (17:54 -0800)]
remove an unnecessary use of sfstropen in GVPR
Related to #1873.
Matthew Fernandez [Wed, 17 Feb 2021 01:44:34 +0000 (01:44 +0000)]
Merge branch 'smattr/
25B6AB1C -1F36-4CEE-87BD-
F608C7459480 ' into 'master'
remove recapitulated prototypes of strcasecmp
See merge request graphviz/graphviz!1741
Matthew Fernandez [Thu, 11 Feb 2021 15:34:43 +0000 (07:34 -0800)]
remove recapitulated prototypes of strcasecmp
These actually cause warnings in CMake Windows builds:
…\lib\cgraph/strcasecmp.h(15,47): warning C4273: '_stricmp': inconsistent
dll linkage […\graphviz\build\plugin\gd\gvplugin_gd.vcxproj]
C:\Program Files (x86)\Windows Kits\10\Include\10.0.18362.0\ucrt\string.h(193,22):
message : see previous definition of '_stricmp'
[…\build\plugin\gd\gvplugin_gd.vcxproj]
and MSBuild Windows builds:
…\lib\cgraph\strcasecmp.h(23,64): warning C4211: nonstandard extension used:
redefined extern to static […\graphviz\lib\cgraph\cgraph.vcxproj]
…\lib\cgraph\strcasecmp.h(27,75): warning C4211: nonstandard extension used:
redefined extern to static […\lib\cgraph\cgraph.vcxproj]
and Cygwin MinGW builds:
…/lib/cgraph/strcasecmp.h:15:5: warning: '_stricmp' redeclared without
dllimport attribute: previous dllimport ignored [-Wattributes]
15 | int strcasecmp(const char *s1, const char *s2);
| ^~~~~~~~~~
…/lib/cgraph/strcasecmp.h:16:5: warning: '_strnicmp' redeclared without
dllimport attribute: previous dllimport ignored [-Wattributes]
16 | int strncasecmp(const char *s1, const char *s2, size_t n);
| ^~~~~~~~~~~
Related to #1940.
Matthew Fernandez [Tue, 16 Feb 2021 16:01:17 +0000 (16:01 +0000)]
Merge branch 'add-gvpr-to-cmake-builds' into 'master'
Add gvpr to CMake builds
Closes #1878
See merge request graphviz/graphviz!1684
Magnus Jacobsson [Tue, 24 Nov 2020 23:13:28 +0000 (00:13 +0100)]
Remove unnecessary declaration of libc time function
Is available through '#include <time.h>'.
Magnus Jacobsson [Tue, 24 Nov 2020 21:40:45 +0000 (22:40 +0100)]
Remove unused sfexit.c and replace waitpid declaration with std
Magnus Jacobsson [Sun, 22 Nov 2020 07:13:00 +0000 (08:13 +0100)]
Remove gvpr from tools not built with CMake in ci/tests.py
Magnus Jacobsson [Sun, 22 Nov 2020 16:18:14 +0000 (17:18 +0100)]
Add skip of test_gvpr_example for 64-bit Windows builds
Fails because of https://gitlab.com/graphviz/graphviz/-/issues/1882.
Magnus Jacobsson [Sun, 22 Nov 2020 12:51:25 +0000 (13:51 +0100)]
Add skip of gvpr bbox & col test also for Windows CMake builds
Fails because of https://gitlab.com/graphviz/graphviz/-/issues/1784.
Magnus Jacobsson [Sun, 22 Nov 2020 10:55:53 +0000 (11:55 +0100)]
Fix gvpr -? to actually print usage and exit non-zero
Magnus Jacobsson [Sat, 21 Nov 2020 19:46:17 +0000 (20:46 +0100)]
Add build of cmd/gvpr using CMake
Resolves https://gitlab.com/graphviz/graphviz/-/issues/1878.
Magnus Jacobsson [Sat, 21 Nov 2020 11:48:55 +0000 (12:48 +0100)]
Add build of lib/gvpr using CMake
Towards https://gitlab.com/graphviz/graphviz/-/issues/1878.
Magnus Jacobsson [Sat, 21 Nov 2020 16:17:52 +0000 (17:17 +0100)]
Add build of lib/expr using CMake
Towards https://gitlab.com/graphviz/graphviz/-/issues/1878.
Magnus Jacobsson [Sat, 21 Nov 2020 19:34:48 +0000 (20:34 +0100)]
Add build of lib/ast using CMake
Towards https://gitlab.com/graphviz/graphviz/-/issues/1878.
Magnus Jacobsson [Sat, 21 Nov 2020 17:31:57 +0000 (18:31 +0100)]
Add build of lib/sfio using CMake
Towards https://gitlab.com/graphviz/graphviz/-/issues/1878.
Magnus Jacobsson [Sun, 22 Nov 2020 07:01:30 +0000 (08:01 +0100)]
Add missing lib/pack CMake dependency to lib/gvc
Matthew Fernandez [Mon, 15 Feb 2021 19:39:51 +0000 (19:39 +0000)]
Merge branch 'smattr/
10F637A0 -9721-4680-A7BA-
37B3CBE3BC2F ' into 'master'
silence some markdownlint warnings
See merge request graphviz/graphviz!1761
Matthew Fernandez [Mon, 15 Feb 2021 19:16:54 +0000 (11:16 -0800)]
silence some markdownlint warnings
Matthew Fernandez [Mon, 15 Feb 2021 05:02:08 +0000 (05:02 +0000)]
Merge branch 'smattr/
056A5DAD -1EFB-41E9-BDBF-
737CB8FA0DA2 ' into 'master'
fix: use public inheritance in VPSC hierarchy
See merge request graphviz/graphviz!1737
Matthew Fernandez [Sun, 3 Jan 2021 01:27:53 +0000 (17:27 -0800)]
remove now-unnecessary cast
Related to #1874.
Matthew Fernandez [Sun, 3 Jan 2021 01:25:19 +0000 (17:25 -0800)]
fix: use public inheritance in VPSC hierarchy
This removes some C++ undefined behavior where libvpsc casts of IncVPSC pointers
to VPSC pointers were invalid due to private inheritance. There was no need to
use private inheritance here, so we now simply use public inheritance. Fixes
#1874.
Matthew Fernandez [Sun, 14 Feb 2021 17:03:21 +0000 (17:03 +0000)]
Merge branch 'smattr/
8d9e1781 -cb6e-4eb7-a5fb-
7d1cca23f690 ' into 'master'
remove use of regex for identifying plugin libraries
See merge request graphviz/graphviz!1731
Matthew Fernandez [Fri, 5 Feb 2021 02:46:23 +0000 (18:46 -0800)]
remove use of regex for identifying plugin libraries
This removes some dynamic allocations and failure paths, accelerating the
determination of the "is this library a Graphviz plugin?" check. Though the root
motivation here is removing a dependency on regular expressions. The resulting
code being more efficient is a pleasant side effect. A step along the way to
#1919.
Matthew Fernandez [Fri, 5 Feb 2021 01:46:14 +0000 (17:46 -0800)]
remove unused DMKEY
Mark Hansen [Sun, 14 Feb 2021 05:53:50 +0000 (05:53 +0000)]
Merge branch 'smoosh' into 'master'
Smoosh some Dockerfile layers into one
See merge request graphviz/graphviz!1753
Mark Hansen [Sun, 14 Feb 2021 05:51:42 +0000 (16:51 +1100)]
Smoosh some Dockerfile layers into one
This is kind of a test for the new automatic building of dockerfiles.
This should make for smaller images and slightly faster CI runs.
The tradeoff is slower local builds if you'd cached the earlier bits.
But now we can easily build these on the cloud when changed.
Mark Hansen [Sun, 14 Feb 2021 05:39:30 +0000 (05:39 +0000)]
Merge branch 'remove-comment' into 'master'
Remove my hacky comment that forced CI builds of Dockerfiles
See merge request graphviz/graphviz!1752
Mark Hansen [Sun, 14 Feb 2021 05:38:54 +0000 (16:38 +1100)]
Remove my hacky comment that forced CI builds of Dockerfiles
Cleanup for #1943
Mark Hansen [Sun, 14 Feb 2021 05:34:38 +0000 (05:34 +0000)]
Merge branch 'list' into 'master'
Fix python typing warning
See merge request graphviz/graphviz!1744
Mark Hansen [Sun, 14 Feb 2021 05:06:17 +0000 (05:06 +0000)]
Merge branch 'cmake' into 'master'
Install cmake in ubuntu-18.04 image
See merge request graphviz/graphviz!1751
Mark Hansen [Sun, 14 Feb 2021 05:05:08 +0000 (16:05 +1100)]
Install cmake in ubuntu-18.04 image
I suppose sometime, canonical must have removed cmake from the deps of another package we installed.
Towards #1946