diff --git a/.github/actions/maven-publish/action.yml b/.github/actions/maven-publish/action.yml index b99ed108a..169fb3d83 100644 --- a/.github/actions/maven-publish/action.yml +++ b/.github/actions/maven-publish/action.yml @@ -22,11 +22,13 @@ runs: - name: Setup Java shell: bash + env: + JAVA_VERSION: ${{ inputs.java-version }} run: | curl -s "https://get.sdkman.io" | bash source "/home/runner/.sdkman/bin/sdkman-init.sh" sdk list java - sdk install java ${{ inputs.java-version }} && sdk default java ${{ inputs.java-version }} + sdk install java $JAVA_VERSION && sdk default java $JAVA_VERSION export JAVA_HOME=${SDKMAN_DIR}/candidates/java/current echo "JAVA_HOME is set to $JAVA_HOME" diff --git a/.github/actions/rl-scanner/action.yml b/.github/actions/rl-scanner/action.yml index 03c378a0c..5f2547651 100644 --- a/.github/actions/rl-scanner/action.yml +++ b/.github/actions/rl-scanner/action.yml @@ -40,16 +40,18 @@ runs: RLSECURE_SITE_KEY: ${{ env.RLSECURE_SITE_KEY }} SIGNAL_HANDLER_TOKEN: ${{ env.SIGNAL_HANDLER_TOKEN }} PYTHONUNBUFFERED: 1 + ARTIFACT_PATH: ${{ inputs.artifact-path }} + VERSION: ${{ inputs.version }} run: | - if [ ! -f "${{ inputs.artifact-path }}" ]; then - echo "Artifact not found: ${{ inputs.artifact-path }}" + if [ ! -f "$ARTIFACT_PATH" ]; then + echo "Artifact not found: $ARTIFACT_PATH" exit 1 fi rl-wrapper \ - --artifact "${{ inputs.artifact-path }}" \ + --artifact "$ARTIFACT_PATH" \ --name "${{ github.event.repository.name }}" \ - --version "${{ inputs.version }}" \ + --version "$VERSION" \ --repository "${{ github.repository }}" \ --commit "${{ github.sha }}" \ --build-env "github_actions" \ diff --git a/.github/workflows/rl-scanner.yml b/.github/workflows/rl-scanner.yml index 810c5277c..8b1802533 100644 --- a/.github/workflows/rl-scanner.yml +++ b/.github/workflows/rl-scanner.yml @@ -49,8 +49,10 @@ jobs: uses: ./.github/actions/get-version - name: Create tgz build artifact + env: + ARTIFACT_NAME: ${{ inputs.artifact-name }} run: | - tar -czvf ${{ inputs.artifact-name }} * + tar -czvf $ARTIFACT_NAME * - name: Run RL Scanner id: rl-scan-conclusion