From f147bd7360224de78df23c14b713c8840feabd95 Mon Sep 17 00:00:00 2001 From: Artem Rys Date: Thu, 10 Feb 2022 18:08:26 +0100 Subject: [PATCH 1/2] ci: update poetry installation commands --- .github/workflows/build-test-release.yml | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build-test-release.yml b/.github/workflows/build-test-release.yml index f603466ad..713d62908 100644 --- a/.github/workflows/build-test-release.yml +++ b/.github/workflows/build-test-release.yml @@ -59,22 +59,13 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Install Poetry - run: curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python3 - - - name: Get UI Base + - name: Install and build run: | + curl -sSL https://install.python-poetry.org | python3 - ./get-ucc-ui.sh # Puts package and schema subdirs along with NOTICE (THIRDPARTY.npm) tar -zxf splunk-ucc-ui.tgz -C splunk_add_on_ucc_framework/ - - name: Install Code - run: | - # shellcheck disable=SC1090 - source "$HOME/.poetry/env" poetry install - - name: Build - run: | - # shellcheck disable=SC1090 - source "$HOME/.poetry/env" poetry build - name: Ensure all UCC UI files are in the final package run: ./.github/workflows/check_ucc_ui_files.sh @@ -168,16 +159,11 @@ jobs: with: python-version: "3.7" - name: Install Poetry - run: curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python3 - - - name: Get UI Base run: | + curl -sSL https://install.python-poetry.org | python3 - ./get-ucc-ui.sh # Puts package and schema subdirs along with NOTICE (THIRDPARTY.npm) tar -zxf splunk-ucc-ui.tgz -C splunk_add_on_ucc_framework/ - - name: Build - run: | - # shellcheck disable=SC1090 - source "$HOME/.poetry/env" poetry build - name: Ensure all UCC UI files are in the final package run: ./.github/workflows/check_ucc_ui_files.sh From a2664cfaca00bc2054ed4aaff5a0809ba722ea99 Mon Sep 17 00:00:00 2001 From: Artem Rys Date: Thu, 10 Feb 2022 18:13:52 +0100 Subject: [PATCH 2/2] ci: remove another poetry env --- .github/workflows/build-test-release.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build-test-release.yml b/.github/workflows/build-test-release.yml index 713d62908..aa7643f59 100644 --- a/.github/workflows/build-test-release.yml +++ b/.github/workflows/build-test-release.yml @@ -71,8 +71,6 @@ jobs: run: ./.github/workflows/check_ucc_ui_files.sh - name: Run Pytest with coverage run: | - # shellcheck disable=SC1090 - source "$HOME/.poetry/env" poetry run pytest --cov=./splunk_add_on_ucc_framework --cov-report=xml --junitxml=test-results/junit.xml - name: Upload coverage to Codecov uses: codecov/codecov-action@v2.1.0