Fixing inputs on the test step

rsksmart · Jul 18, 2024 · 7ae7388 · 7ae7388
1 parent cbefcc7
commit 7ae7388
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/.github/action.yml b/.github/action.yml
@@ -30,7 +30,7 @@ runs:
   using: docker
   image: ./images/Dockerfile
   env:
-    RSKJ_BRANCH: ${{ inputs.rskj-branch }}
-    POWPEG_NODE_BRANCH: ${{ inputs.powpeg-node-branch }}
-    RIT_BRANCH: ${{ inputs.rit-branch }}
-    RIT_LOG_LEVEL: ${{ inputs.rit-log-level }}
+    INPUT_RSKJ-BRANCH: ${{ inputs.rskj-branch }}
+    INPUT_POWPEG-NODE-BRANCH: ${{ inputs.powpeg-node-branch }}
+    INPUT_RIT-BRANCH: ${{ inputs.rit-branch }}
+    INPUT_RIT-LOG-LEVEL: ${{ inputs.rit-log-level }}
diff --git a/.github/images/entrypoint.sh b/.github/images/entrypoint.sh
@@ -5,15 +5,15 @@ set -e
 echo -e "\n\n--------- Starting the configuration of rskj ---------\n\n"
 cd /usr/src/
 git clone https://github.com/rsksmart/rskj.git rskj
-cd rskj && git checkout "${INPUT_RSKJ_BRANCH}"
+cd rskj && git checkout "${INPUT_RSKJ-BRANCH}"
 chmod +x ./configure.sh && chmod +x gradlew
 ./configure.sh
 
 echo -e  "\n\n--------- Starting the configuration of powpeg ---------\n\n"
 cd /usr/src/
 git clone https://github.com/rsksmart/powpeg-node.git powpeg
 cp configure_gradle_powpeg.sh powpeg
-cd powpeg && git checkout "${INPUT_POWPEG_NODE_BRANCH}"
+cd powpeg && git checkout "${INPUT_POWPEG-NODE-BRANCH}"
 chmod +x ./configure.sh && chmod +x gradlew
 POWPEG_VERSION=$(bash configure_gradle_powpeg.sh)
 echo "POWPEG_VERSION=$POWPEG_VERSION"
@@ -27,11 +27,11 @@ mv configure_rit_locally.sh rit
 mv regtest.js rit/config/regtest.js
 mv /usr/src/logbacks/* /usr/src/rit/logbacks/
 cd rit
-git checkout "${INPUT_RIT_BRANCH}"
+git checkout "${INPUT_RIT-BRANCH}"
 chmod +x ./configure.sh
 ./configure.sh
 ./configure_rit_locally.sh "${POWPEG_VERSION}"
-export LOG_LEVEL="${INPUT_RIT_LOG_LEVEL}"
+export LOG_LEVEL="${INPUT_RIT-LOG-LEVEL}"
 
 echo -e "\n\n--------- Executing Rootstock Integration Tests ---------\n\n"
 npm install -y

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,12 +49,17 @@ jobs:
 
       - name: Test the RIT Container Action
         id: test-container
+        env:
+          INPUT_RSKJ_BRANCH: master
+          INPUT_POWPEG_NODE_BRANCH: master
+          INPUT_RIT_BRANCH: main
+          INPUT_RIT_LOG_LEVEL: info
         run: |
           docker run  \
-            --env INPUT_RSKJ_BRANCH="master" \
-            --env INPUT_POWPEG_NODE_BRANCH="master" \
-            --env INPUT_RIT_BRANCH="main" \
-            --env INPUT_RIT_LOG_LEVEL="info" \
+            --env INPUT_RSKJ-BRANCH="${{ env.INPUT_RSKJ_BRANCH }}" \
+            --env INPUT_POWPEG-NODE-BRANCH="${{ env.INPUT_POWPEG_NODE_BRANCH }}"  \
+            --env INPUT_RIT-BRANCH="${{ env.INPUT_RIT_BRANCH }}"  \
+            --env INPUT_RIT-LOG-LEVEL="${{ env.INPUT_RIT_LOG_LEVEL }}"  \
             --env GITHUB_OUTPUT="/github-output" \
             -v "$GITHUB_OUTPUT:/github-output" \
             --rm ${{ env.TEST_TAG }}