From b935a6ea80751f830ebbf402336331f2a4f28f96 Mon Sep 17 00:00:00 2001 From: Anton Smorodskyi Date: Tue, 2 Dec 2025 11:55:27 +0100 Subject: [PATCH] Upgrade to 15.1 and migrate to git workflow --- _services | 20 ++ mark-15.1.0.tar.gz | 3 + mark.changes | 472 +++++++++++++++++++++++++++++++++++++++++++++ mark.spec | 64 ++++++ vendor.tar.gz | 3 + 5 files changed, 562 insertions(+) create mode 100644 _services create mode 100644 mark-15.1.0.tar.gz create mode 100644 mark.changes create mode 100644 mark.spec create mode 100644 vendor.tar.gz diff --git a/_services b/_services new file mode 100644 index 0000000..89cbb02 --- /dev/null +++ b/_services @@ -0,0 +1,20 @@ + + + + https://github.com/kovetskiy/mark.git + git + @PARENT_TAG@ + v(.*) + enable + v15.1.0 + + + + + + + gz + *.tar + + + diff --git a/mark-15.1.0.tar.gz b/mark-15.1.0.tar.gz new file mode 100644 index 0000000..ca9fcca --- /dev/null +++ b/mark-15.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e5b9557d58cbee015ef2b850086c61a74d66f93dcbf596fdfbc253ca508aa90 +size 75961 diff --git a/mark.changes b/mark.changes new file mode 100644 index 0000000..bdfde80 --- /dev/null +++ b/mark.changes @@ -0,0 +1,472 @@ +------------------------------------------------------------------- +Fri Sep 19 08:00:24 UTC 2025 - Elisei Roca + +- Update to version 15.0.0: + * Bump dependencies + * Fix sigsegv + * feature: add Server param to Jira ticket template + * Add support for using the filename as the page title + * Drop cloudscript support for mermaid + +- Update to version v14.1.2: + * Bump dependencies + +------------------------------------------------------------------- +Tue Jul 15 07:00:37 UTC 2025 - Elisei Roca + +- Update to version 14.1.1: + * Bump dependencies + * Document admonitions feature + +- Update to version 14.1.0: + * Bump dependencies + * feat: add Support for converting Material for MkDocs Admonitions + to Confluence Info Panels + +------------------------------------------------------------------- +Thu Jun 12 13:08:55 UTC 2025 - Elisei Roca + +- Breaking changes + * Default config is now ~/.config/mark.toml instead of ~/.config/mark + * Arguments with underscore as well as config keys with underscores + are removed. Use the hyphenated versions. + +- Update to version 14.0.4: + * Bump dependencies + * Get version from ldflags + * Fix tests as well + * fix: Initialize D2Scale configuration member + * fix: when using confluence cloud (with prefix) the /wiki keeps getting removed + * fix: Config loading from file + * Only use hyphenated versions of config keys + +------------------------------------------------------------------- +Mon Jun 02 08:26:34 UTC 2025 - Elisei Roca + +- Update to version 13.0.0: + * Bump dependencies + * Add support for d2lang + * Migrate to urfave/cli/v3 + * Deprecate mermaid via cloudscript + (mermaid.go will be the only solution in 14.x and later) + * Fix #594: nil pointer dereference + +- Update to version 12.2.0: + * Bump dependencies + * feat: use gopencils retrial option, upgrade version + * Fix lint issues detected by golangci v2 + * Fix data path specification on TestContinueOnError + * More code fixes for unit-testing '--continue-on-error' + * Restructure code for more testaability + * change COE flag testing logic to use internal functions + * add batch test, test function for continue-on-error flag + * add batch tests in sub directory under /testdata + * fix: correct Errorf/Fatalf argument handling + * add code & testing files for continue-on-error flag + +------------------------------------------------------------------- +Fri Feb 21 17:03:48 UTC 2025 - Elisei Roca + +- Update to version 12.1.2: + * Revert back to go 1.23 + * add check for dry-run and compile-only flags + * remove extra newline/space + * return nil instead of exiting, check for nil in loop + * docs: describe how to use the emoji header + * fix: profile picture + * style: typos + * feat: support emojis on pages + * docs: fix indentation for ac:children macro arguments description + +------------------------------------------------------------------- +Thu Feb 13 10:22:10 UTC 2025 - Elisei Roca + +- Update to version 12.0.1: + * Bump dependencies + * PageTree macro: Fix Title parameter usage. (fixes #550) + +------------------------------------------------------------------- +Wed Jan 22 11:04:05 UTC 2025 - Elisei Roca + +- Update to version 12.0.0: + * Bump dependencies + * Update main.go + * fix spacing + * add flag for updating on change + * CR fixes + * Log levels support + +------------------------------------------------------------------- +Wed Dec 11 16:48:20 UTC 2024 - Elisei Roca + +- Update to version 11.3.1: + * Bump dependencies + * Fix test + * Fix env var + * Fixed attachment name handling in ac:multimedia macro + * Support named excerpts + +------------------------------------------------------------------- +Sun Nov 10 19:52:52 UTC 2024 - Elisei Roca + +- Update to version 11.3.0: + * Bump dependencies + * Feat: Use custom heading anchors + * Use query param for labels + +------------------------------------------------------------------- +Wed Oct 09 09:49:36 UTC 2024 - Elisei Roca + +- Update to version 11.2.0: + * Bump dependencies + * feat: add flag to append hash to pages to ensure unique titles + * blockquote: Fix invalid access + * Remove superfluous testcases + * *: Reorganize code + * Dockerfile: Run apt-get upgrade + * To add support for github md alerts + * Fix multimedia macro + +------------------------------------------------------------------- +Tue Sep 10 12:26:58 UTC 2024 - Elisei Roca + +- Update to version 11.0.0: + * Bump dependencies + * Use relative links for objects within the same Confluence instance + * Build with go 1.23 + * stdlib: Add multimedia macro + * Fix: Early exit when deleting label + * strip common clause license condition v1.0 + * go.mod: Update dependencies + * Fix paragraphs + * Dockerfile: Build with 1.22.6 + * Include firstColumn parameter + * Build with go 1.22 + * Fix markdown lint + +------------------------------------------------------------------- +Mon Jul 29 09:24:58 UTC 2024 - Elisei Roca + +- Update to version 10.0.0: + * Bump dependencies + * Document placeholders + * Drop legacy pattern check + * Fix links containing an underscore + * Fix Regex for links that contain square brackets in the text + * Prepare for goreleaser v2 + * Do not render paragraph tags + * Revert "Make references to pages within the same Confluence relative" + * Fix quoting + * .gorelease.yml: Replace deprecated fields + * Convert for strings.ToLower to strings.EqualFold as per linter + * Change label management to rely on independent rest calls + * Change label management to rely on independent rest calls + * feat: add placeholder in plain layout + * Make references to pages within the same Confluence relative + * fix: ac:jiraissues to use correct format for the urls + +------------------------------------------------------------------- +Mon Apr 15 09:55:16 UTC 2024 - Elisei Roca + +- Drop go_provides and go_nostrip, they aren't needed +- Rename binary from mark-go to just mark + +------------------------------------------------------------------- +Fri Apr 12 14:35:04 UTC 2024 - Elisei Roca + +- Update to version 9.12.0: + * Bump dependencies + * Add option to pass a version message + * Build multi-arch image for amd64 and arm64 + * Add markdown lint + * Document column macro + * add support to column macro + +------------------------------------------------------------------- +Fri Jan 19 17:38:26 UTC 2024 - Elisei Roca + +- Update to version 9.11.1: + * Bump dependencies + * Fix layout section attribute tags (#401) + * feat: Support for double star (**) globbing (#392) + * docs: Fix typo: preprended + * docs: Fix typo: preprended + * change: Move back to XHTML + * .github: Update Issue template + * dependabot: Add Docker config + * feat: Add fallback directory to load includes from + * change: Move from XHTML to HTML5 + * Add dependabot integration + * Rebase fixup + * Fixes for Attachments + * Adding comments, removing stray imports + * Adding linebreak stripping + * describe config directory locations + * switch from $HOME to UserConfigDir + * Sync confluencetag parser with upstream + * chore: Migrate to a goldmark extension + +------------------------------------------------------------------- +Tue Sep 12 14:08:25 UTC 2023 - Elisei Roca + +- Update to version 9.9.0: + * feat: Allow scaling of mermaid rendering + * Define parent pages from CLI + * Add pagetreesearch macro + +------------------------------------------------------------------- +Tue Aug 01 09:24:38 UTC 2023 - Elisei Roca + +- Update to version 9.7.1: + * Bump dependencies + * .goreleaser: Update deprecated syntax * Add recently-updated macro + * Add panel macro + * .github: Reorder steps to use module caching + * doc: clarify links usage of page title with spaces + * go.mod: Update dependencies + +------------------------------------------------------------------- +Wed Jun 14 15:27:25 UTC 2023 - Elisei Roca + +- Update to version 9.6.1: + * Disable typographer extension + * Fix flaky mermaid png test + * Update README.md + * Update pkg/mark/stdlib/stdlib.go + * Fix user mentioning + * Update mermaid to v10.2.0 + * Add Jira Filter View Macro + * Add Page properties macro + * Add Page Properties Report macro + * Add contentbylabel macro + +------------------------------------------------------------------- +Thu May 25 08:46:01 UTC 2023 - Elisei Roca + +- Update to version 9.5.2: + * Drop newlines completely from macros + * Drop newlines within macros + * Bump dependencies + * Add user profile macro + * Fallback to old user search + * Add expand macro + * Move drop-h1 to the renderer + * Update README.md + * Fix usage of strings.ReplaceAll + * fix 305: external images URLs are not properly escaped + * Support customizable layouts + * Fix mermaid-go rendering + * .goreleaser.yml: Support arm64 builds + * Support inline images + * Add debug output for config + * Dockerfile: Use dumb-init and overwrite entrypoint + +------------------------------------------------------------------- +Wed Apr 26 07:30:40 UTC 2023 - Elisei Roca + +- Update to version 9.2.0: + * Add support for mermaid via library + * Add issue templates + * Ignore error if default config file does not exist + * Make config backwards-compatible + * Simplify config handling + * .github: Quote go version + * .github: Fix goreleaser build + * .github: Fix tag + * .github: Fix release workflow + +------------------------------------------------------------------- +Mon Apr 03 11:38:40 UTC 2023 - Elisei Roca + +- Update to version 9.1.0: + * Push Docker image on tag + * Update to go 1.20 + * feat: Support anchor macro + * feat: Add Excerpt and ExcerptInclude macros + * feat: Support page inclusion macro + +- Update to version 9.0.3: + * Fix custom link renderer and add tests for Confluence links + * Implement a custom parser for tags + +- Update to version 9.0.2: + * Rename variable + * Fix "" tag rendering + +- Update to version 9.0.1: + * Render CodeBlocks properly + +- Update to version 9.0: + * Replace blackfriday with goldmark + +------------------------------------------------------------------- +Mon Mar 27 19:33:17 UTC 2023 - Elisei Roca + +- Update to version 8.10: + * feat: moving to IsTextFile for file type detection + * fix: extract metadata fails for file types which are not .md + +------------------------------------------------------------------- +Tue Mar 21 17:31:56 UTC 2023 - Elisei Roca + +- Update to version 8.9: + * Include space parameter as well + * Clean up logic a bit + * fix: Support relative links with titleFromH1 + * Add Content-Appearance header + +- Update to version 8.8: + * .github: Add build image step + * Dockerfile: Freeze builder image versions + * Add width keyword for html comment + * Add blog-posts macro + * bugfix: Remove forced default width, forced full-width without editor config #175 + * Add ac:image width and edited README.md + * ac:image + * To add fallack to blockquote when type is none + +- Update to version 8.7: + * .github: Build with go 1.19 + * fix: Properly handle macro when extracting Metadata + * go.mod: Update dependencies + * fix: Title not being extracted when not on the first line + * Lint: Disable staticcheck for strings.Title + * fix: rendermode typo broke builds + * .github: Move CI into the right folder (#239) + * Lint + * .github: Add CI pipeline + * Makefile: Add test target + * no funding needed + * feat: support ac:jiraissues macro + +- Update to version 8.6: + * all-contributors: generate thank you list + * Feature/prokod/#194 (#237) + +- Update to version 8.5: + * Fix for jira.com hosted sites (#231) + * Replace deprecated io/ioutils (#230) + * Feature/themed blocks (#223) + * This should fix #171 by allowing a markdown link to start with ac: (#222) + * Allow Title via h1 without any other metadata (#229) + +------------------------------------------------------------------- +Tue Mar 21 17:31:08 UTC 2023 - Elisei Roca + +- Update to version 8.4: + * small style fixes related to templates + * go.mod: Update dependencies (#211) + * Correct attachment name to include path on update (#215) + * fix 178: update breaks on more than 50 attachments (#220) + * fix ancestry search + * Fix builds on go 1.18 (#206) + * Do not require password and url when compileonly (#193) + * fix issue 177 (#200) + * update install instructions with latest go standards (#202) + +------------------------------------------------------------------ +Wed Oct 19 16:10:26 UTC 2022 - Elisei Roca + +- Update to version 8.4: + * small style fixes related to templates + * go.mod: Update dependencies (#211) + * Correct attachment name to include path on update (#215) + * fix 178: update breaks on more than 50 attachments (#220) + +------------------------------------------------------------------- +Wed Oct 19 16:10:16 UTC 2022 - Elisei Roca + +- Update to version 8.3: + * fix ancestry search + +------------------------------------------------------------------- +Wed Oct 19 16:10:05 UTC 2022 - Elisei Roca + +- Update to version 8.2: + * Fix builds on go 1.18 (#206) + * Do not require password and url when compileonly (#193) + * fix issue 177 (#200) + * update install instructions with latest go standards (#202) + * fix 142 redone for current master (#199) + * Feature/docker4build (#192) + * introduce inline templates (#198) + * Feature/h1 title (#196) + * allow templates and macros to include blanks in path (#191) + +------------------------------------------------------------------- +Wed Oct 19 16:08:26 UTC 2022 - Elisei Roca + +- Update to version 8.1: + * fix for nil metadata (issue #161) (#162) + * fix the README (#172) + * bugfix: Add delay between create and update calls (#174) + * bugfix: Force pages to default width. (#175) + * fix: remove double collapse for codeboxes (#179) + * do not build for windows: it is broken + * Add subdirectories related templates (#158) + * Add footnotes support (#156) + +------------------------------------------------------------------- +Wed Feb 01 20:06:43 UTC 2022 - Elisei Roca + +- Update to version 8.0: + * do not build for windows: it is broken + * Add subdirectories related templates (#158) + * Add footnotes support (#156) + * feat: Add support of confluence server. (#154) + * add open_collective to FUNDING + +- Update to version 7.0: + * Fix for subdirectories related attachments (issue #31) (#151) + * Space from config and title from h1 (#153) + * Add option to define Space. + Add option to use H1 heading to define page title. + * Update readme + * feat: update to go 1.17 (#147) + * add .dockerignore + +------------------------------------------------------------------- +Thu Dec 09 11:28:54 UTC 2021 - Elisei Roca + +- Remove symbol and debug info from binary + +- Update to version 6.7: + * fix updating attachments when confluence returns a short response object + +- Update to version 6.6: + * feat: add iframe support (#143) + * Change log level when files are not found (#138) + * Add @mmiranda as a contributor + * Add @jevfok as a contributor + +- Update to version 6.5.1: + * Homebrew tap (#137) + * use AutoLink rule to all links except ac: namespace + +- Update to version 6.5: + * replace \r\n with \n, fix #42 + * Children display macro (#133) + * Update golang crypto library to fix CVE-2020-29652 (#131) + +- Update to version 6.4: + * feat: youtube widget macro (#127) + * feat: support mermaid graphs (#128) + +- Update to version 6.3: + * fix #114 do not crash when resolving links on directories + * add table test + +- Update to version 6.2: + * add config parameter + +- Update to version 6.1: + * Add @eitchugo as a contributor + * allow space home update and its children pages (#101) + - fix coding styling + - codestyle: fix checking isHomepage + - codestyle: fix checking skipHomeAncestry + +------------------------------------------------------------------- +Fri Aug 13 16.31:36 UTC 2021 - Elisei Roca + +- Initial packaging mark 6.0 diff --git a/mark.spec b/mark.spec new file mode 100644 index 0000000..52c254f --- /dev/null +++ b/mark.spec @@ -0,0 +1,64 @@ +# +# spec file for package mark +# +# Copyright (c) 2025 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# +# nodebuginfo + +Name: mark +Version: 15.1.0 +Release: 0 +Summary: A tool for syncing your markdown documentation with Atlassian Confluence pages +License: Apache-2.0 +Group: Development/Languages/Other +URL: https://github.com/kovetskiy/mark +Source0: mark-%{version}.tar.gz +Source1: vendor.tar.gz +BuildRequires: golang(API) >= 1.24 +BuildRequires: golang-packaging + +%description +This is very useful if you store documentation to your software in a Git +repository and don't want to do an extra job of updating Confluence page +using a tinymce wysiwyg enterprise core editor which always breaks everything. + +Mark does the same but in a different way. Mark reads your markdown file, +creates a Confluence page if it's not found by its name, uploads attachments, +translates Markdown into HTML and updates the contents of the page via REST API. +It's like you don't even need to create sections/pages in your Confluence anymore, +just use them in your Markdown documentation. + +Mark uses an extended file format, which, still being valid markdown, contains +several HTML-ish metadata headers, which can be used to locate page inside +Confluence instance and update it accordingly. + +%prep +%autosetup -D -a 1 -n mark-%{version} + +%build +export GOFLAGS="$GOFLAGS -buildmode=pie -mod=vendor -trimpath" +export LDFLAGS="-X main.version=%{version}" +go build -o bin/mark + +%install +install -D -m 0755 ./bin/mark "%{buildroot}/%{_bindir}/mark" + +%check + +%files +%doc README.md +%license LICENSE +%{_bindir}/mark + +%changelog diff --git a/vendor.tar.gz b/vendor.tar.gz new file mode 100644 index 0000000..121cd2d --- /dev/null +++ b/vendor.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:048f92433b428674356df237c5686442deb65b46121e5eba5532b3965ef4dc1f +size 11704318