From ed7583bbe36361c7134ed291d6eadfe6103e7bc2 Mon Sep 17 00:00:00 2001 From: Dmytro Kvashnin <139753462+dkvashninsplunk@users.noreply.github.com> Date: Mon, 22 Jan 2024 14:44:53 +0100 Subject: [PATCH 1/3] chore: github dependencies support for ssh (#219) We are generally using ssh key for development instead of https. this will support both cases in requirements.txt and poetry Poetry example: ``` splunksdc = {git = "https://github.com/splunk/splunksdc.git", tag = "v0.1.2"} splunksdc = {git = "ssh://git@github.com/splunk/splunksdc.git", tag = "v0.1.2"} ``` --- .github/workflows/reusable-build-test-release.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/reusable-build-test-release.yml b/.github/workflows/reusable-build-test-release.yml index e4cadf74c..350e6f6fa 100644 --- a/.github/workflows/reusable-build-test-release.yml +++ b/.github/workflows/reusable-build-test-release.yml @@ -440,7 +440,8 @@ jobs: poetry export --without-hashes --dev -o requirements_dev.txt fi if [ ! -f requirements_dev.txt ]; then echo no requirements;exit 0 ;fi - git config --global url."https://${{ secrets.GH_TOKEN_ADMIN }}@github.com".insteadOf https://github.com + git config --global --add url."https://${{ secrets.GH_TOKEN_ADMIN }}@github.com".insteadOf https://github.com + git config --global --add url."https://${{ secrets.GH_TOKEN_ADMIN }}@github.com".insteadOf ssh://git@github.com pip install -r requirements_dev.txt - name: Create directories run: | @@ -489,7 +490,8 @@ jobs: poetry export --without-hashes --dev -o requirements_dev.txt fi if [ ! -f requirements_dev.txt ]; then echo no requirements;exit 0 ;fi - git config --global url."https://${{ secrets.GH_TOKEN_ADMIN }}@github.com".insteadOf https://github.com + git config --global --add url."https://${{ secrets.GH_TOKEN_ADMIN }}@github.com".insteadOf https://github.com + git config --global --add url."https://${{ secrets.GH_TOKEN_ADMIN }}@github.com".insteadOf ssh://git@github.com pip install -r requirements_dev.txt - name: Create directories run: | @@ -571,7 +573,8 @@ jobs: - name: Install deps if: ${{ steps.checklibs.outputs.ENABLED == 'true' }} run: | - git config --global url."https://${{ secrets.GH_TOKEN_ADMIN }}@github.com".insteadOf https://github.com + git config --global --add url."https://${{ secrets.GH_TOKEN_ADMIN }}@github.com".insteadOf https://github.com + git config --global --add url."https://${{ secrets.GH_TOKEN_ADMIN }}@github.com".insteadOf ssh://git@github.com pip install -r requirements_dev.txt - name: Semantic Release Get Next id: semantic @@ -703,7 +706,8 @@ jobs: restore-keys: | ${{ runner.os }}-pip-python3_9 - run: | - git config --global url."https://${{ secrets.GH_TOKEN_ADMIN }}@github.com".insteadOf https://github.com + git config --global --add url."https://${{ secrets.GH_TOKEN_ADMIN }}@github.com".insteadOf https://github.com + git config --global --add url."https://${{ secrets.GH_TOKEN_ADMIN }}@github.com".insteadOf ssh://git@github.com pip install -r requirements_dev.txt - id: semantic if: github.event_name != 'pull_request' From bb61d729771f289903d04d31750890522bde7d6c Mon Sep 17 00:00:00 2001 From: Marcin Bruzda <94437843+mbruzda-splunk@users.noreply.github.com> Date: Mon, 22 Jan 2024 15:38:40 +0100 Subject: [PATCH 2/3] fix: openapi artifact path (#220) tested here: https://github.com/splunk/splunk-add-on-for-crowdstrike-fdr/actions/runs/7610192878?pr=822 --- .github/workflows/reusable-build-test-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-build-test-release.yml b/.github/workflows/reusable-build-test-release.yml index 350e6f6fa..b6be86a0a 100644 --- a/.github/workflows/reusable-build-test-release.yml +++ b/.github/workflows/reusable-build-test-release.yml @@ -623,7 +623,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: artifact-openapi - path: ${{ github.workspace }}/${{ steps.uccgen.outputs.OUTPUT }}/static/openapi.json + path: ${{ github.workspace }}/${{ steps.uccgen.outputs.OUTPUT }}/appserver/static/openapi.json if: ${{ !cancelled() && needs.test-inventory.outputs.ucc_modinput_functional == 'true' && needs.test-inventory.outputs.modinput_functional == 'true' }} - name: artifact-splunk-base uses: actions/upload-artifact@v3 From 54e4ecd78fdb048d09505ba26fd122a0f489f1ff Mon Sep 17 00:00:00 2001 From: Marcin Bruzda <94437843+mbruzda-splunk@users.noreply.github.com> Date: Mon, 22 Jan 2024 15:51:51 +0100 Subject: [PATCH 3/3] chore: update appinspect-cli to 2.2 (#222) tested here: https://github.com/splunk/splunk-add-on-for-crowdstrike-fdr/actions/runs/7612474417/job/20730350677?pr=823 --- .github/workflows/reusable-build-test-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-build-test-release.yml b/.github/workflows/reusable-build-test-release.yml index b6be86a0a..a25b4d4e5 100644 --- a/.github/workflows/reusable-build-test-release.yml +++ b/.github/workflows/reusable-build-test-release.yml @@ -785,7 +785,7 @@ jobs: name: package-splunkbase path: build/package/ - name: Scan - uses: splunk/appinspect-cli-action@v2.0 + uses: splunk/appinspect-cli-action@v2.2 with: app_path: build/package/ included_tags: ${{ matrix.tags }}