Unverified Commit 0f5fa3a9 authored by Georg Koppen's avatar Georg Koppen
Browse files

Merge remote-tracking branch 'gitlab/merge-requests/83' into maint-1.1

parents 36d96da7 316d67fe

.gitchangelog.rc

+2 −1
Original line number Diff line number Diff line
@@ -187,7 +187,8 @@ unreleased_version_label = "Unreleased" 
##        Examples:

##           - makotemplate("restructuredtext")

##

output_engine = rest_py

#output_engine = rest_py

output_engine = makotemplate(".gitchangelogrst.tpl")

#output_engine = mustache("restructuredtext")

#output_engine = mustache("markdown")

#output_engine = makotemplate("restructuredtext")

.gitchangelogrst.tpl

+4 −8
Original line number Diff line number Diff line
@@ -19,15 +19,11 @@ ${section["label"]} 
${"~" * len(section["label"])}

% endif

% for commit in section["commits"]:

<%

subject = "%s [%s]" % (commit["subject"], ", ".join(commit["authors"]))

entry = indent('\n'.join(textwrap.wrap(subject)),

                       first="- ").strip()

<% c = commit["subject"]

if commit["body"]:

  c += "\n" + commit["body"].replace("\n\n", "\n")

entry = indent(c, first="- ").strip()

%>${entry}



% if commit["body"]:

${indent(commit["body"])}

% endif

% endfor

% endfor

.gitlab-ci.yml

+18 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ python37tormaster: 
  variables:

    BASE_IMAGE: python:3.7

    RELEASE: tor-nightly-master-buster

    TOR: tor=0.4.6*

    TOR: tor=0.4.7*

  image: $BASE_IMAGE

  script:

  - tox -e py37
@@ -131,3 +131,20 @@ python310: 
  - tox -e py310

  - tox -e integration

  allow_failure: true



release_job:

  before_script:

    - echo "Nothing"

  after_script:

    - echo "Nothing"

  image: registry.gitlab.com/gitlab-org/release-cli:latest

  only: [tags]

  script:

    - echo "Running release job."

  release:

    name: "Release $CI_COMMIT_TAG"

    description: "Created using release-cli"

    tag_name: "$CI_COMMIT_TAG"

    ref: "$CI_COMMIT_TAG"

    milestones:

      - "sbws: 1.1.x-final"

AUTHORS.md→AUTHORS.rst

+8 −8
Original line number Diff line number Diff line 
Authors

=======



The following people have contributed to Simple Bandwidth Scanner.

Thank you for helping make Tor better.

The following people have contributed to Simple Bandwidth Scanner. Thank

you for helping make Tor better.



* anadahz

* George Kadianakis

* Georg Koppen

* juga

* Matt Traudt

* teor

-  anadahz

-  George Kadianakis

-  Georg Koppen

-  juga

-  Matt Traudt

-  teor



*Last updated: 2020-06-26 on d7a822bf*

CHANGELOG.rst

+607 −0

File changed.

Preview size limit exceeded, changes collapsed.