From a7121378a52397e24e9c49d21a17cf44cedc900a Mon Sep 17 00:00:00 2001
From: Phil Jay <phil.jay@reece.com.au>
Date: Fri, 22 Oct 2021 11:49:04 +1100
Subject: [PATCH] Fix for composite actions not having INPUT_ vars

See: https://github.com/actions/runner/issues/665
---
 .github/workflows/test-and-release.yml |  2 +-
 README.md                              |  3 +++
 action.yml                             |  4 ++++
 shared.sh                              |  2 +-
 tests/test_version-increment.bats      | 14 +++++++-------
 tests/test_version-lookup.bats         |  4 ++--
 version-increment.sh                   |  2 +-
 7 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml
index 22bbdc3..95a2125 100644
--- a/.github/workflows/test-and-release.yml
+++ b/.github/workflows/test-and-release.yml
@@ -52,7 +52,7 @@ jobs:
         run: ./version-increment.sh
         env:
           current_version: ${{ steps.version-lookup.outputs.current-version }}
-          INPUT_SCHEME: calver
+          scheme: calver
 
       - name: Release version
         uses: marvinpinto/action-automatic-releases@919008cf3f741b179569b7a6fb4d8860689ab7f0
diff --git a/README.md b/README.md
index 0f57d5e..212b485 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,9 @@
 ### ⌨️ Example
 
 ```yaml
+      - name: Checkout code
+        uses: actions/checkout@v2
+
       - name: Get next version
         uses: reecetech/version-increment@2021.10.4
         id: version
diff --git a/action.yml b/action.yml
index 4abcf0d..6eff90c 100644
--- a/action.yml
+++ b/action.yml
@@ -33,9 +33,13 @@ runs:
     - id: version-lookup
       run: ${{ github.action_path }}/version-lookup.sh
       shell: bash
+      env:
+        scheme: ${{ inputs.scheme }}
 
     - id: version-increment
       run: ${{ github.action_path }}/version-increment.sh
       shell: bash
       env:
         current_version: ${{ steps.version-lookup.outputs.current-version }}
+        increment: ${{ inputs.increment }}
+        scheme: ${{ inputs.scheme }}
diff --git a/shared.sh b/shared.sh
index 953506c..2068cee 100644
--- a/shared.sh
+++ b/shared.sh
@@ -15,7 +15,7 @@ pcre_old_calver='^(?P<major>0|[1-9]\d*)-0{0,1}(?P<minor>0|[0-9]\d*)-R(?P<patch>0
 ##  Input validation
 
 input_errors='false'
-scheme="${INPUT_SCHEME:-semver}"
+scheme="${scheme:-semver}"
 if [[ "${scheme}" != 'semver' && "${scheme}" != 'calver' ]] ; then
     echo "🛑 Value of 'scheme' is not valid, choose from 'semver' or 'calver'" 1>&2
     input_errors='true'
diff --git a/tests/test_version-increment.bats b/tests/test_version-increment.bats
index 2c9669c..b6bd967 100644
--- a/tests/test_version-increment.bats
+++ b/tests/test_version-increment.bats
@@ -44,7 +44,7 @@ function init_repo {
 @test "fails if invalid scheme given" {
     init_repo
 
-    export INPUT_SCHEME="foover"
+    export scheme="foover"
 
     run ../../version-increment.sh
 
@@ -56,7 +56,7 @@ function init_repo {
 @test "fails if invalid increment given" {
     init_repo
 
-    export INPUT_INCREMENT="critical"
+    export increment="critical"
 
     run ../../version-increment.sh
 
@@ -69,7 +69,7 @@ function init_repo {
     init_repo
 
     export current_version=1.2.3
-    export INPUT_INCREMENT="patch"
+    export increment="patch"
 
     run ../../version-increment.sh
 
@@ -82,7 +82,7 @@ function init_repo {
     init_repo
 
     export current_version=1.2.3
-    export INPUT_INCREMENT="minor"
+    export increment="minor"
 
     run ../../version-increment.sh
 
@@ -95,7 +95,7 @@ function init_repo {
     init_repo
 
     export current_version=1.2.3
-    export INPUT_INCREMENT="major"
+    export increment="major"
 
     run ../../version-increment.sh
 
@@ -108,7 +108,7 @@ function init_repo {
     init_repo
 
     export current_version=2020.6.4
-    export INPUT_SCHEME="calver"
+    export scheme="calver"
 
     run ../../version-increment.sh
 
@@ -121,7 +121,7 @@ function init_repo {
     init_repo
 
     export current_version="$(date +%Y.%-m.123)"
-    export INPUT_SCHEME="calver"
+    export scheme="calver"
 
     run ../../version-increment.sh
 
diff --git a/tests/test_version-lookup.bats b/tests/test_version-lookup.bats
index 622bc68..f5bd50f 100644
--- a/tests/test_version-lookup.bats
+++ b/tests/test_version-lookup.bats
@@ -20,7 +20,7 @@ function init_repo {
 @test "fails if invalid scheme given" {
     init_repo
 
-    export INPUT_SCHEME="foover"
+    export scheme="foover"
 
     run ../../version-lookup.sh
 
@@ -81,7 +81,7 @@ function init_repo {
 @test "returns a calver if no normal version detected and calver scheme specified" {
     init_repo
 
-    export INPUT_SCHEME="calver"
+    export scheme="calver"
 
     run ../../version-lookup.sh
 
diff --git a/version-increment.sh b/version-increment.sh
index 17d5dd8..2f97fa7 100755
--- a/version-increment.sh
+++ b/version-increment.sh
@@ -6,7 +6,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 # shellcheck source=shared.sh
 source "${script_dir}/shared.sh"
 
-increment="${INPUT_INCREMENT:-patch}"
+increment="${increment:-patch}"
 if [[ "${increment}" != 'patch' && "${increment}" != 'minor' && "${increment}" != 'major' ]] ; then
     echo "🛑 Value of 'increment' is not valid, choose from 'major', 'minor', or 'patch'" 1>&2
     input_errors='true'