From b7a5f208fada95f27c0f87a72870ae7d770d92c5 Mon Sep 17 00:00:00 2001 From: haya14busa Date: Sun, 19 Jan 2020 08:06:35 +0000 Subject: [PATCH 1/2] Add more test patterns --- testdata/testfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testdata/testfile b/testdata/testfile index 501c049..eb18129 100644 --- a/testdata/testfile +++ b/testdata/testfile @@ -1,6 +1,12 @@ This is test file. REVIEWDOG_VERSION=0.1.0 +ENV REVIEWDOG_VERSION=0.1.0 +ENV REVIEWDOG_VERSION 0.1.0 +ARG REVIEWDOG_VERSION=0.1.0 + +yaml: + REVIEWDOG_VERSION: 0.1.0 The above version should be updated to the latest version with this action. From d83a688fafd255a9e7abc7b66a4cb06243eac6fb Mon Sep 17 00:00:00 2001 From: haya14busa Date: Sun, 19 Jan 2020 08:16:16 +0000 Subject: [PATCH 2/2] Support more patterns --- entrypoint.sh | 4 ++-- testdata/testfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index b0b8295..68a3d93 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -10,7 +10,7 @@ REPO="${INPUT_REPO:-reviewdog/reviewdog}" VERSION_NAME="${INPUT_VERSION_NAME:-REVIEWDOG_VERSION}" # Get current version. -CURRENT_VERSION=$(grep -oP "${VERSION_NAME}=\K\d+\.\d+\.\d+" "${FILE}") +CURRENT_VERSION=$(grep -oP "${VERSION_NAME}(=|:?\s+)\v?\K\d+\.\d+\.\d+" "${FILE}" | head -n1) if [ -z "${CURRENT_VERSION}" ]; then echo "cannot parse ${VERSION_NAME}" exit 1 @@ -47,7 +47,7 @@ if [ "${CURRENT_VERSION}" = "${LATEST_VERSION}" ]; then fi echo "Updating ${VERSION_NAME} to ${LATEST_VERSION} in ${FILE}" -sed -i "s/\(${VERSION_NAME}=\)\([0-9]\+\.[0-9]\+\.\?[0-9]\+\)/\1${LATEST_VERSION}/" "${FILE}" +sed -i "s/\(${VERSION_NAME}\(=\|:\?\s\+\)v\?\)\([0-9]\+\.[0-9]\+\.\?[0-9]\+\)/\1${LATEST_VERSION}/" "${FILE}" echo "Updated. Commit and create Pull-Request as you need." echo "::set-output name=current::${CURRENT_VERSION}" diff --git a/testdata/testfile b/testdata/testfile index eb18129..41bc285 100644 --- a/testdata/testfile +++ b/testdata/testfile @@ -1,10 +1,10 @@ This is test file. +REVIEWDOG_VERSION=v0.1.0 REVIEWDOG_VERSION=0.1.0 ENV REVIEWDOG_VERSION=0.1.0 ENV REVIEWDOG_VERSION 0.1.0 ARG REVIEWDOG_VERSION=0.1.0 - yaml: REVIEWDOG_VERSION: 0.1.0