From 04415e6dcc236c27f6990c7c616c2c59055761e1 Mon Sep 17 00:00:00 2001 From: Stephen L Arnold Date: Fri, 30 Sep 2022 21:11:53 -0700 Subject: [PATCH 1/2] chg: usr: update tag_regexps in default config, bump dep version * make sure 'v' tag prefix is recognized * install latest gitchangelog using gh wheel url Signed-off-by: Stephen L Arnold --- Dockerfile | 2 +- gitchangelog-release.rc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6988309..e24d1a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ RUN apk --no-cache add \ git \ py3-pip -RUN pip install https://github.com/sarnold/gitchangelog/archive/refs/tags/3.0.9.tar.gz +RUN pip install https://github.com/sarnold/gitchangelog/releases/download/3.1.0/gitchangelog-3.1.0-py3-none-any.whl ADD ./gitchangelog-release.rc /gitchangelog-release.rc diff --git a/gitchangelog-release.rc b/gitchangelog-release.rc index 7e00ff5..11f4666 100644 --- a/gitchangelog-release.rc +++ b/gitchangelog-release.rc @@ -152,8 +152,8 @@ subject_process = (strip | ## ## Tags that will be used for the changelog must match this regexp. ## -#tag_filter_regexp = r'^v?[0-9]+\.[0-9]+(\.[0-9]+)?$' -tag_filter_regexp = r'^[0-9]+\.[0-9]+(\.[0-9]+)?$' +tag_filter_regexp = r'^v?[0-9]+\.[0-9]+(\.[0-9]+)?$' +#tag_filter_regexp = r'^[0-9]+\.[0-9]+(\.[0-9]+)?$' ## ``unreleased_version_label`` is a string or a callable that outputs a string From dda0d76ca48ac6218eb5265bc53589e99510b5b6 Mon Sep 17 00:00:00 2001 From: Stephen L Arnold Date: Sun, 2 Oct 2022 19:22:20 -0700 Subject: [PATCH 2/2] chg: use python:alpine image, bump gitchangelog version to latest * update docker file for new container usage Signed-off-by: Stephen L Arnold --- Dockerfile | 19 ++++++++----------- requirements.txt | 1 + 2 files changed, 9 insertions(+), 11 deletions(-) create mode 100644 requirements.txt diff --git a/Dockerfile b/Dockerfile index e24d1a9..5a8adef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine +FROM python:3.9-alpine3.16 LABEL "maintainer"="Stephen Arnold " \ "repository"="https://github.com/sarnold/gitchangelog-action" \ @@ -8,17 +8,14 @@ LABEL "maintainer"="Stephen Arnold " \ "com.github.actions.icon"="check-circle" \ "com.github.actions.color"="package" -RUN apk --no-cache add \ - python3 \ - python3-dev \ - bash \ - git \ - py3-pip +RUN apk --no-cache add git bash -RUN pip install https://github.com/sarnold/gitchangelog/releases/download/3.1.0/gitchangelog-3.1.0-py3-none-any.whl +ADD genchangelog.sh / +ADD requirements.txt / +ADD gitchangelog-release.rc / -ADD ./gitchangelog-release.rc /gitchangelog-release.rc - -ADD ./genchangelog.sh /genchangelog.sh +RUN pip install --upgrade pip && \ + pip install --no-cache-dir -r /requirements.txt +RUN chmod +x /genchangelog.sh ENTRYPOINT ["/genchangelog.sh"] diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..09327f1 --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +https://github.com/sarnold/gitchangelog/releases/download/3.1.1/gitchangelog-3.1.1-py3-none-any.whl