From 948d763801ec731918aa070af201ea43f89a593c Mon Sep 17 00:00:00 2001 From: Afonso Filho Date: Tue, 11 Feb 2025 11:14:09 -0300 Subject: [PATCH 1/3] feat: improve linux installation Signed-off-by: Afonso Filho --- action.yml | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/action.yml b/action.yml index 2f9ec6b..c78bcb5 100644 --- a/action.yml +++ b/action.yml @@ -23,9 +23,31 @@ runs: - name: Install STK CLI run: | if [[ "$(uname)" = "Linux" ]]; then - # Install jq, curl, zip, and git - sudo apt-get update - sudo apt-get install -y jq curl zip git + PACKAGES_TO_INSTALL="" + if [ "$(which curl)" = "" ] + then + PACKAGES_TO_INSTALL="curl " + fi + if [ "$(which git)" = "" ] + then + PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL git " + fi + if [ "$(which jq)" = "" ] + then + PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL jq " + fi + if [ "$(which zip)" = "" ] + then + PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL zip " + fi + if [ "$PACKAGES_TO_INSTALL" != "" ] + then + sudo apt-get install -y $PACKAGES_TO_INSTALL + else + echo "All packages already installed !!!" + fi + unset PACKAGES_TO_INSTALL + cd /tmp curl -fsSL https://stk.stackspot.com/install.sh | bash echo "~/.stk/bin" >> $GITHUB_PATH From 8ed00e9a0bd28732393810c3e2838285a35b7e22 Mon Sep 17 00:00:00 2001 From: Afonso Filho Date: Tue, 11 Feb 2025 11:19:11 -0300 Subject: [PATCH 2/3] ci: remove sast workflow Signed-off-by: Afonso Filho --- .github/workflows/sast | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 .github/workflows/sast diff --git a/.github/workflows/sast b/.github/workflows/sast deleted file mode 100644 index 557412e..0000000 --- a/.github/workflows/sast +++ /dev/null @@ -1,16 +0,0 @@ -name: SAST - Static application security testing - -on: - workflow_dispatch: - push: - -jobs: - appsec-workflow: - uses: ZupIT/appsec-workflow/.github/workflows/appsec-workflow.yml@v1.3 - with: - debug: false - repository: ${{github.event.repository.name}} - organization: ${{github.repository_owner}} - environment: main - secrets: - report-secret: ${{ secrets.VULN_MNG_REPORT_KEY }} From 0954e9401e32c17194f9bb2196d81cdc366470ab Mon Sep 17 00:00:00 2001 From: Afonso Filho Date: Tue, 11 Feb 2025 11:19:23 -0300 Subject: [PATCH 3/3] ci: fix tests Signed-off-by: Afonso Filho --- .github/workflows/action-test-macos.yml | 13 +++++++------ .github/workflows/action-test-ubuntu.yml | 13 +++++++------ .github/workflows/action-test-windows.yml | 12 +++++++----- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.github/workflows/action-test-macos.yml b/.github/workflows/action-test-macos.yml index f00cdb7..2fe7535 100644 --- a/.github/workflows/action-test-macos.yml +++ b/.github/workflows/action-test-macos.yml @@ -18,14 +18,15 @@ jobs: os: [macos-12, macos-latest] runs-on: ${{ matrix.os }} steps: - - name: Run STK CLI installation - uses: stack-spot/stk-cli-action@main + - name: Checkout code + uses: actions/checkout@v4 + + - name: Test changes + uses: ./ with: client_id: ${{ secrets.CLIENT_ID }} client_key: ${{ secrets.CLIENT_KEY }} realm: ${{ secrets.REALM }} - - run: stk --version - - # - name: Setup upterm session - # uses: lhotari/action-upterm@v1 + - name: Show STK CLI version + run: stk --version diff --git a/.github/workflows/action-test-ubuntu.yml b/.github/workflows/action-test-ubuntu.yml index 5911ef7..5a69367 100644 --- a/.github/workflows/action-test-ubuntu.yml +++ b/.github/workflows/action-test-ubuntu.yml @@ -18,14 +18,15 @@ jobs: os: [ubuntu-20.04, ubuntu-22.04, ubuntu-latest] runs-on: ${{ matrix.os }} steps: - - name: Run STK CLI installation - uses: stack-spot/stk-cli-action@main + - name: Checkout code + uses: actions/checkout@v4 + + - name: Test changes + uses: ./ with: client_id: ${{ secrets.CLIENT_ID }} client_key: ${{ secrets.CLIENT_KEY }} realm: ${{ secrets.REALM }} - - run: stk --version - - # - name: Setup upterm session - # uses: lhotari/action-upterm@v1 + - name: Show STK CLI version + run: stk --version diff --git a/.github/workflows/action-test-windows.yml b/.github/workflows/action-test-windows.yml index 2902e28..bc43146 100644 --- a/.github/workflows/action-test-windows.yml +++ b/.github/workflows/action-test-windows.yml @@ -18,13 +18,15 @@ jobs: os: [windows-2019, windows-2022, windows-latest] runs-on: ${{ matrix.os }} steps: - - name: Run STK CLI installation - uses: stack-spot/stk-cli-action@main + - name: Checkout code + uses: actions/checkout@v4 + + - name: Test changes + uses: ./ with: client_id: ${{ secrets.CLIENT_ID }} client_key: ${{ secrets.CLIENT_KEY }} realm: ${{ secrets.REALM }} - - run: stk --version - shell: bash - + - name: Show STK CLI version + run: stk --version