From 335a0e88b1d72c957650a68a19773fda611804bd Mon Sep 17 00:00:00 2001
From: Brandon W Maister <quodlibetor@gmail.com>
Date: Wed, 19 Jun 2024 20:23:55 -0400
Subject: [PATCH] Set a wider range of acceptable base64 versions

This works without change for base64 version 21 or 22, so allow users
to specify either
---
 .github/workflows/push.yml | 15 ++++++++++++++-
 Cargo.toml                 |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 56f680d..795b2a2 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -16,6 +16,13 @@ jobs:
     strategy:
       matrix:
         rust-version: [stable, beta, nightly]
+        include:
+          - rust-version: stable
+            base64-version: ["0.21", ""]
+          - rust-version: beta
+            base64-version: [""]
+          - rust-version: nightly
+            base64-version: [""]
 
     services:
       postgres:
@@ -42,7 +49,13 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build
-        run: cargo build --features diesel-uuid,serde
+        run: |
+          if [ -n "${{ matrix.base64-version }}" ] ; then
+            cargo remove base64
+            cargo add base64@${{ matrix.base64-version }}
+          fi
+
+          cargo build --features diesel-uuid,serde
 
       - name: Test
         run: cargo nextest run --features diesel-uuid,serde
diff --git a/Cargo.toml b/Cargo.toml
index abc5ef2..84855b6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2021"
 travis-ci = { repository = "quodlibetor/uuid-b64", branch = "master" }
 
 [dependencies]
-base64 = "0.22.0"
+base64 = ">=0.21.0,<=0.22"
 diesel-derive-newtype = { version = "2.1.0", optional = true }
 diesel = { version = "2.2.0", features = ["postgres", "uuid"], optional = true }
 error-chain = "0.12.0"