From 5fcb6cd0c861c12bb577b6c43c354f30b484e35b Mon Sep 17 00:00:00 2001
From: Steve Arnold <sarnold@vctlabs.com>
Date: Sat, 23 Mar 2024 10:22:46 -0700
Subject: [PATCH 1/2] chg: bump versions of gitchangelog and workflow actions

Signed-off-by: Steve Arnold <sarnold@vctlabs.com>
---
 .github/workflows/main.yml    | 10 +++++-----
 .github/workflows/release.yml |  4 ++--
 requirements.txt              |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 46e0b1b..5bca72c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04, ubuntu-20.04]
+        os: [ubuntu-20.04, ubuntu-22.04]
 
     runs-on: ${{ matrix.os }}
     defaults:
@@ -25,19 +25,19 @@ jobs:
       # To use this repository's private action,
       # you must check out the repository
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Get version
-        if: matrix.os == 'ubuntu-20.04'
+        if: matrix.os == 'ubuntu-22.04'
         id: get_version
         run: |
           echo "VERSION=$(git describe --abbrev=0 --tags)" >> $GITHUB_ENV
           echo ${{ env.VERSION }}
 
       - name: Unset version
-        if: matrix.os == 'ubuntu-18.04'
+        if: matrix.os == 'ubuntu-20.04'
         id: rm_version
         run: |
           echo "GIT_TAG=$(git describe --abbrev=0 --tags)"
@@ -62,7 +62,7 @@ jobs:
           fi
 
       - name: Checkout test repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: sarnold/gitchangelog
           path: vendor/gcl-test
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ee21b71..358ee96 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-22.04]
 
     runs-on: ${{ matrix.os }}
     defaults:
@@ -24,7 +24,7 @@ jobs:
       # To use this repository's private action,
       # you must check out the repository
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
diff --git a/requirements.txt b/requirements.txt
index 6047df7..014c098 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-https://github.com/sarnold/gitchangelog/releases/download/3.1.2/gitchangelog-3.1.2-py3-none-any.whl
+https://github.com/sarnold/gitchangelog/releases/download/3.2.0/gitchangelog-3.2.0-py3-none-any.whl

From af0ea975ab0045aebdacc57a12ba0b9f29c86ab7 Mon Sep 17 00:00:00 2001
From: Steve Arnold <sarnold@vctlabs.com>
Date: Sat, 23 Mar 2024 10:56:39 -0700
Subject: [PATCH 2/2] fix: make git describe find the right tag with multiple
 choices

* this should make sure git can find the right tag regardless of
  tag type or date ordering

Signed-off-by: Steve Arnold <sarnold@vctlabs.com>
---
 .github/workflows/main.yml    | 2 +-
 .github/workflows/release.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5bca72c..3ac2712 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -33,7 +33,7 @@ jobs:
         if: matrix.os == 'ubuntu-22.04'
         id: get_version
         run: |
-          echo "VERSION=$(git describe --abbrev=0 --tags)" >> $GITHUB_ENV
+          echo "VERSION=$(git describe --abbrev=0 --tags --match 1*)" >> $GITHUB_ENV
           echo ${{ env.VERSION }}
 
       - name: Unset version
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 358ee96..875f6f9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Get version
         id: get_version
         run: |
-          echo "VERSION=$(git describe --abbrev=0 --tags)" >> $GITHUB_ENV
+          echo "VERSION=$(git describe --abbrev=0 --tags --match 1*)" >> $GITHUB_ENV
           echo ${{ env.VERSION }}
 
       - name: gitchangelog action step (debug)