Merge pull request #54 from liquibase/bugfix/inputRequirements

Bugfix/input requirements
liquibase · Aug 11, 2023 · 3197e84 · 3197e84
2 parents d886f0d + e01c4f6
commit 3197e84
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/.github/workflows/os-extension-test.yml b/.github/workflows/os-extension-test.yml
@@ -14,10 +14,6 @@ on:
         default: '["ubuntu-latest", "windows-latest"]'
         type: string
 
-env:
-  JAVA_INPUT: ${{ github.event.inputs.java || '[8, 11, 17, 18]' }}
-  OS_INPUT: ${{ github.event.inputs.os || '["ubuntu-latest", "windows-latest"]' }}
-
 jobs:
   build:
     name: Build & Package
@@ -59,8 +55,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: ${{ fromJSON(env.JAVA_INPUT) }}
-        os: ${{ fromJSON(env.OS_INPUT) }}
+        java: ${{fromJson(env.INPUT_JAVA)}}
+        os: ${{fromJson(env.INPUT_OS)}}
     name: Test Java ${{ matrix.java }} - ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     needs: build

diff --git a/.github/workflows/pro-extension-test.yml b/.github/workflows/pro-extension-test.yml
@@ -33,8 +33,6 @@ env:
   AWS_ACCESS_KEY_ID: ${{ secrets.GHA_AWS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.GHA_AWS_KEY }}
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  JAVA_INPUT: ${{ github.event.inputs.java || '[8, 11, 17, 18]' }}
-  OS_INPUT: ${{ github.event.inputs.os || '["ubuntu-latest", "windows-latest"]' }}
 
 jobs:
   build:
@@ -77,8 +75,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: ${{ fromJSON(env.JAVA_INPUT) }}
-        os: ${{ fromJSON(env.OS_INPUT) }}
+        java: ${{fromJson(env.INPUT_JAVA)}}
+        os: ${{fromJson(env.INPUT_OS)}}
     name: Test Java ${{ matrix.java }} - ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     needs: build
@@ -112,4 +110,4 @@ jobs:
   sonar-pr:
     needs: [ unit-test ]
     uses: liquibase/build-logic/.github/workflows/[email protected]
-    secrets: inherit
+    secrets: inherit