diff --git a/.github/actions/maven-publish/action.yml b/.github/actions/maven-publish/action.yml index b20ed43..643b49e 100644 --- a/.github/actions/maven-publish/action.yml +++ b/.github/actions/maven-publish/action.yml @@ -21,14 +21,12 @@ 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 $JAVA_VERSION && sdk default java $JAVA_VERSION - export JAVA_HOME="${SDKMAN_DIR}/candidates/java/current" + sdk install java ${{ inputs.java-version }} && sdk default java ${{ inputs.java-version }} + export JAVA_HOME=${SDKMAN_DIR}/candidates/java/current echo "JAVA_HOME is set to $JAVA_HOME" - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # pin@1.1.0 diff --git a/.github/actions/rl-scanner/action.yml b/.github/actions/rl-scanner/action.yml index 98e9c26..eb01713 100644 --- a/.github/actions/rl-scanner/action.yml +++ b/.github/actions/rl-scanner/action.yml @@ -40,18 +40,16 @@ 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 "$ARTIFACT_PATH" ]; then - echo "Artifact not found: $ARTIFACT_PATH" + if [ ! -f "${{ inputs.artifact-path }}" ]; then + echo "Artifact not found: ${{ inputs.artifact-path }}" exit 1 fi rl-wrapper \ - --artifact "$ARTIFACT_PATH" \ + --artifact "${{ inputs.artifact-path }}" \ --name "${{ github.event.repository.name }}" \ - --version "$VERSION" \ + --version "${{ inputs.version }}" \ --repository "${{ github.repository }}" \ --commit "${{ github.sha }}" \ --build-env "github_actions" \ diff --git a/.github/workflows/rl-secure.yml b/.github/workflows/rl-secure.yml index 950a8e8..a9bfda6 100644 --- a/.github/workflows/rl-secure.yml +++ b/.github/workflows/rl-secure.yml @@ -53,10 +53,8 @@ jobs: uses: ./.github/actions/get-version - name: Create tgz build artifact - env: - ARTIFACT_NAME: ${{ inputs.artifact-name }} run: | - tar -czvf $ARTIFACT_NAME * + tar -czvf ${{ inputs.artifact-name }} * - name: Run RL Scanner id: rl-scan-conclusion