From 2f880830cb7209c9f1edf5f845b095540e9c81b5 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 09:44:07 -0700 Subject: [PATCH 001/101] Added build_and_test GitHub Action --- .github/workflows/build_and_test.yml | 36 ++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/build_and_test.yml diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml new file mode 100644 index 00000000..7236261d --- /dev/null +++ b/.github/workflows/build_and_test.yml @@ -0,0 +1,36 @@ +name: CI + +on: push + +jobs: + build_and_test: + runs-on: ubuntu-latest + name: 'Build and Test - Python ${{ matrix.python-version-short }}' + strategy: + matrix: + include: + - python-version-short: 3.6 + python-version: 3.6.13 + steps: + # eventually replace @gha with @master + - name: Checkout Pack Repo and CI Repos + uses: StackStorm-Exchange/ci/gha/checkout@gha + + - name: Install APT Dependencies + uses: StackStorm-Exchange/ci/gha/apt-dependencies@gha + with: + cache-version: v0 + + - name: Install Python Dependencies + uses: StackStorm-Exchange/ci/gha/py-dependencies@gha + with: + cache-version: v0 + python-version: ${{ matrix.python-version }} + + # vault pack would add one or more custom test setup steps here + + - name: Run pack tests + uses: StackStorm-Exchange/ci/gha/test@gha + with: + # This makes the tests use an alternate config that enables shared libs + enable-common-libs: true From f7db1aaa7b86f7d78644ae101ce3f0c05e5e1cad Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 09:46:23 -0700 Subject: [PATCH 002/101] build_and_test.yml: Changed pointer from StackStorm-Exchange to lm-ydubler --- .github/workflows/build_and_test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 7236261d..30716cb6 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -14,15 +14,15 @@ jobs: steps: # eventually replace @gha with @master - name: Checkout Pack Repo and CI Repos - uses: StackStorm-Exchange/ci/gha/checkout@gha + uses: lm-ydubler/ci/gha/checkout@gha - name: Install APT Dependencies - uses: StackStorm-Exchange/ci/gha/apt-dependencies@gha + uses: lm-ydubler/ci/gha/apt-dependencies@gha with: cache-version: v0 - name: Install Python Dependencies - uses: StackStorm-Exchange/ci/gha/py-dependencies@gha + uses: lm-ydubler/ci/gha/py-dependencies@gha with: cache-version: v0 python-version: ${{ matrix.python-version }} @@ -30,7 +30,7 @@ jobs: # vault pack would add one or more custom test setup steps here - name: Run pack tests - uses: StackStorm-Exchange/ci/gha/test@gha + uses: lm-ydubler/ci/gha/test@gha with: # This makes the tests use an alternate config that enables shared libs enable-common-libs: true From 7c41b43df8156ec745e411da3208149501f4ce55 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 09:47:10 -0700 Subject: [PATCH 003/101] Delete --- .github/workflows/build_and_test.yml | 36 ---------------------------- 1 file changed, 36 deletions(-) delete mode 100644 .github/workflows/build_and_test.yml diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml deleted file mode 100644 index 30716cb6..00000000 --- a/.github/workflows/build_and_test.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: CI - -on: push - -jobs: - build_and_test: - runs-on: ubuntu-latest - name: 'Build and Test - Python ${{ matrix.python-version-short }}' - strategy: - matrix: - include: - - python-version-short: 3.6 - python-version: 3.6.13 - steps: - # eventually replace @gha with @master - - name: Checkout Pack Repo and CI Repos - uses: lm-ydubler/ci/gha/checkout@gha - - - name: Install APT Dependencies - uses: lm-ydubler/ci/gha/apt-dependencies@gha - with: - cache-version: v0 - - - name: Install Python Dependencies - uses: lm-ydubler/ci/gha/py-dependencies@gha - with: - cache-version: v0 - python-version: ${{ matrix.python-version }} - - # vault pack would add one or more custom test setup steps here - - - name: Run pack tests - uses: lm-ydubler/ci/gha/test@gha - with: - # This makes the tests use an alternate config that enables shared libs - enable-common-libs: true From 77f79d5d0570486a95cc869c4a90d2ef0c8eb3ae Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:01:38 -0700 Subject: [PATCH 004/101] checkout/action.yaml: Added a shell field (opting to use the bash shell) --- gha/checkout/action.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/gha/checkout/action.yaml b/gha/checkout/action.yaml index 2c64bd3b..0629e22a 100644 --- a/gha/checkout/action.yaml +++ b/gha/checkout/action.yaml @@ -21,6 +21,7 @@ inputs: runs: using: "composite" + shell: bash steps: - name: Configure git user env: From 77876cc03403eb424881a8b9b5368a8fef278eab Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:05:20 -0700 Subject: [PATCH 005/101] checkout/action.yaml: Added shell field (using bash shell) --- gha/checkout/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/checkout/action.yaml b/gha/checkout/action.yaml index 0629e22a..4491c20e 100644 --- a/gha/checkout/action.yaml +++ b/gha/checkout/action.yaml @@ -21,9 +21,9 @@ inputs: runs: using: "composite" - shell: bash steps: - name: Configure git user + shell: bash env: GIT_USER_NAME: "${{ inputs.git_user_name }}" GIT_USER_EMAIL: "${{ inputs.git_user_email }}" From d706ee86053492e80434936874d9778c1fbd0efc Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:11:12 -0700 Subject: [PATCH 006/101] checkout/action.yaml: Updated pack repository path to 'lm-ydubler/logicmonitor-stackstorm-pack' --- gha/checkout/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/checkout/action.yaml b/gha/checkout/action.yaml index 4491c20e..7c6bcf4a 100644 --- a/gha/checkout/action.yaml +++ b/gha/checkout/action.yaml @@ -33,7 +33,7 @@ runs: - name: Checkout pack repo uses: actions/checkout@v2 - path: pack + path: lm-ydubler/logicmonitor-stackstorm-pack depth: 1 - name: Checkout st2 repo From 4e4e376b8d2e2a3ad72eedd2d477fa1372b526b5 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:13:18 -0700 Subject: [PATCH 007/101] checkout/action.yaml: Fixing the 'pack' field --- gha/checkout/action.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gha/checkout/action.yaml b/gha/checkout/action.yaml index 7c6bcf4a..8f0e065f 100644 --- a/gha/checkout/action.yaml +++ b/gha/checkout/action.yaml @@ -33,7 +33,8 @@ runs: - name: Checkout pack repo uses: actions/checkout@v2 - path: lm-ydubler/logicmonitor-stackstorm-pack + with: + path: pack depth: 1 - name: Checkout st2 repo From 6676404979db3592c999d1a1a5032b8d40ff8d76 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:25:45 -0700 Subject: [PATCH 008/101] apt-dependencies/action.yaml: Added shell field (using bash shell) --- gha/apt-dependencies/action.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/gha/apt-dependencies/action.yaml b/gha/apt-dependencies/action.yaml index cdd88782..a9951d76 100644 --- a/gha/apt-dependencies/action.yaml +++ b/gha/apt-dependencies/action.yaml @@ -25,6 +25,7 @@ runs: - name: Cache APT Dependencies id: cache-apt-deps + shell: bash uses: actions/cache@v2 with: path: | From 934facf25c2e0d1c3dc6d51590e101a2b2be0891 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:27:29 -0700 Subject: [PATCH 009/101] apt-dependencies/action.yaml: Added shell field (using bash) --- gha/apt-dependencies/action.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/gha/apt-dependencies/action.yaml b/gha/apt-dependencies/action.yaml index a9951d76..ccc5f047 100644 --- a/gha/apt-dependencies/action.yaml +++ b/gha/apt-dependencies/action.yaml @@ -15,6 +15,7 @@ runs: - name: Create a directory for debian packages so we can cache it # this is what we did on CircleCI. Not sure if it'll work on GHA + shell: bash run: > sudo rm -rf /var/cache/apt/archives && sudo ln -s ~/apt_cache /var/cache/apt/archives From baed83e43284ece9e711abfc8ad60690fcccebe3 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:30:33 -0700 Subject: [PATCH 010/101] apt-dependencies/action.yaml: Removed a shell field --- gha/apt-dependencies/action.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/gha/apt-dependencies/action.yaml b/gha/apt-dependencies/action.yaml index ccc5f047..ea9fce9c 100644 --- a/gha/apt-dependencies/action.yaml +++ b/gha/apt-dependencies/action.yaml @@ -26,7 +26,6 @@ runs: - name: Cache APT Dependencies id: cache-apt-deps - shell: bash uses: actions/cache@v2 with: path: | From 51488d9324e3a0a5ffd0a03d76097ec8cdff1aec Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:32:04 -0700 Subject: [PATCH 011/101] apt-dependencies/action.yaml: Added shell fields (using bash) --- gha/apt-dependencies/action.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gha/apt-dependencies/action.yaml b/gha/apt-dependencies/action.yaml index ea9fce9c..6f6ae919 100644 --- a/gha/apt-dependencies/action.yaml +++ b/gha/apt-dependencies/action.yaml @@ -35,6 +35,7 @@ runs: ${{ runner.os }}-apt-${{ input.cache-version }}- - name: Install APT Dependencies + shell: bash env: CACHE_HIT: ${{steps.cache-apt-deps.outputs.cache-hit}} APT_PACKAGES_FILE_PATH: ${{github.action_path + '/apt-packages.txt'}} @@ -46,6 +47,7 @@ runs: sudo apt-get -y install ${APT_PACKAGES} - name: Print versions + shell: bash run: | set -ex jq --version From b5b8c74894b8f3f25d34d51dc787e2150e395d25 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:34:56 -0700 Subject: [PATCH 012/101] apt-dependencies/action.yaml: Changed 'input' to 'inputs' --- gha/apt-dependencies/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/apt-dependencies/action.yaml b/gha/apt-dependencies/action.yaml index 6f6ae919..58a2b665 100644 --- a/gha/apt-dependencies/action.yaml +++ b/gha/apt-dependencies/action.yaml @@ -30,7 +30,7 @@ runs: with: path: | ~/apt_cache - key: ${{ runner.os }}-apt-${{ input.cache-version }}-${{ hashFiles(github.action_path + '/apt-packages.txt') }} + key: ${{ runner.os }}-apt-${{ inputs.cache-version }}-${{ hashFiles(github.action_path + '/apt-packages.txt') }} restore-keys: | ${{ runner.os }}-apt-${{ input.cache-version }}- From ddc7b48c701e1690e4a37845686eac3acba2e43a Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:44:09 -0700 Subject: [PATCH 013/101] apt-dependencies/action.yaml: Fixing a string concatenation error --- gha/apt-dependencies/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/apt-dependencies/action.yaml b/gha/apt-dependencies/action.yaml index 58a2b665..43cda85d 100644 --- a/gha/apt-dependencies/action.yaml +++ b/gha/apt-dependencies/action.yaml @@ -30,7 +30,7 @@ runs: with: path: | ~/apt_cache - key: ${{ runner.os }}-apt-${{ inputs.cache-version }}-${{ hashFiles(github.action_path + '/apt-packages.txt') }} + key: ${{ runner.os }}-apt-${{ inputs.cache-version }}-${{ hashFiles(join(github.action_path,'/apt-packages.txt')) }} restore-keys: | ${{ runner.os }}-apt-${{ input.cache-version }}- From 7ca92d37fd13a21e91e86c48c39ba51e0ecaa287 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:48:42 -0700 Subject: [PATCH 014/101] apt-dependencies/action.yaml: Fixing string concatention error --- gha/apt-dependencies/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/apt-dependencies/action.yaml b/gha/apt-dependencies/action.yaml index 43cda85d..423fa5dc 100644 --- a/gha/apt-dependencies/action.yaml +++ b/gha/apt-dependencies/action.yaml @@ -30,7 +30,7 @@ runs: with: path: | ~/apt_cache - key: ${{ runner.os }}-apt-${{ inputs.cache-version }}-${{ hashFiles(join(github.action_path,'/apt-packages.txt')) }} + key: ${{ runner.os }}-apt-${{ inputs.cache-version }}-${{ hashFiles(join([github.action_path,'/apt-packages.txt'],'')) }} restore-keys: | ${{ runner.os }}-apt-${{ input.cache-version }}- From b3b59da8a9829328fe50bb7bdd580865d89bfbe3 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:53:39 -0700 Subject: [PATCH 015/101] apt-dependencies/action.yaml: Fixing string concatenation error --- gha/apt-dependencies/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/apt-dependencies/action.yaml b/gha/apt-dependencies/action.yaml index 423fa5dc..ed2db6f2 100644 --- a/gha/apt-dependencies/action.yaml +++ b/gha/apt-dependencies/action.yaml @@ -30,7 +30,7 @@ runs: with: path: | ~/apt_cache - key: ${{ runner.os }}-apt-${{ inputs.cache-version }}-${{ hashFiles(join([github.action_path,'/apt-packages.txt'],'')) }} + key: ${{ runner.os }}-apt-${{ inputs.cache-version }}-${{ hashFiles( ${{ join(github.action_path,'/apt-packages.txt','') }} ) }} restore-keys: | ${{ runner.os }}-apt-${{ input.cache-version }}- From dc80fd2b2c3863e16968ca52709acb5449be7c72 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:57:46 -0700 Subject: [PATCH 016/101] apt-dependencies/action.yaml: Fixing string concatenation error --- gha/apt-dependencies/action.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gha/apt-dependencies/action.yaml b/gha/apt-dependencies/action.yaml index ed2db6f2..8418927b 100644 --- a/gha/apt-dependencies/action.yaml +++ b/gha/apt-dependencies/action.yaml @@ -8,6 +8,9 @@ inputs: cache-version: required: false default: "v0" + hashfiles-path: + required: false + default: ${{ format('{}{}', github.action_path, '/apt-packages.txt') }} runs: using: "composite" @@ -30,9 +33,9 @@ runs: with: path: | ~/apt_cache - key: ${{ runner.os }}-apt-${{ inputs.cache-version }}-${{ hashFiles( ${{ join(github.action_path,'/apt-packages.txt','') }} ) }} + key: ${{ runner.os }}-apt-${{ inputs.cache-version }}-${{ hashFiles( $${{inputs.hashfiles-path}} ) }} restore-keys: | - ${{ runner.os }}-apt-${{ input.cache-version }}- + ${{ runner.os }}-apt-${{ inputs.cache-version }}- - name: Install APT Dependencies shell: bash From 39218dda0f5c35830ce9dd7501482b5410ee2cda Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:59:56 -0700 Subject: [PATCH 017/101] apt-dependencies/action.yaml: Fixing string concatenation error --- gha/apt-dependencies/action.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gha/apt-dependencies/action.yaml b/gha/apt-dependencies/action.yaml index 8418927b..13692043 100644 --- a/gha/apt-dependencies/action.yaml +++ b/gha/apt-dependencies/action.yaml @@ -33,7 +33,7 @@ runs: with: path: | ~/apt_cache - key: ${{ runner.os }}-apt-${{ inputs.cache-version }}-${{ hashFiles( $${{inputs.hashfiles-path}} ) }} + key: ${{ runner.os }}-apt-${{ inputs.cache-version }}-${{ hashFiles( ${{inputs.hashfiles-path}} ) }} restore-keys: | ${{ runner.os }}-apt-${{ inputs.cache-version }}- @@ -41,7 +41,7 @@ runs: shell: bash env: CACHE_HIT: ${{steps.cache-apt-deps.outputs.cache-hit}} - APT_PACKAGES_FILE_PATH: ${{github.action_path + '/apt-packages.txt'}} + APT_PACKAGES_FILE_PATH: ${{ format('{}{}', github.action_path, '/apt-packages.txt') }} run: | if [[ "$CACHE_HIT" != 'true' ]]; then sudo apt-get -y update From 707907efeeaf70df5d08e722654d9a537a290247 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:02:09 -0700 Subject: [PATCH 018/101] apt-dependencies/action.yaml: Fixed string concatenation error --- gha/apt-dependencies/action.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gha/apt-dependencies/action.yaml b/gha/apt-dependencies/action.yaml index 13692043..c999c5b7 100644 --- a/gha/apt-dependencies/action.yaml +++ b/gha/apt-dependencies/action.yaml @@ -8,9 +8,6 @@ inputs: cache-version: required: false default: "v0" - hashfiles-path: - required: false - default: ${{ format('{}{}', github.action_path, '/apt-packages.txt') }} runs: using: "composite" @@ -33,7 +30,7 @@ runs: with: path: | ~/apt_cache - key: ${{ runner.os }}-apt-${{ inputs.cache-version }}-${{ hashFiles( ${{inputs.hashfiles-path}} ) }} + key: ${{ runner.os }}-apt-${{ inputs.cache-version }}-${{ hashFiles('${{ format('{}{}', github.action_path, '/apt-packages.txt') }}') }} restore-keys: | ${{ runner.os }}-apt-${{ inputs.cache-version }}- From 239055496dd4bcebb73a8473913f1f5d3b9765ec Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:03:40 -0700 Subject: [PATCH 019/101] apt-dependencies/action.yaml: Fixed string concatenation error --- gha/apt-dependencies/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/apt-dependencies/action.yaml b/gha/apt-dependencies/action.yaml index c999c5b7..fe57ffe9 100644 --- a/gha/apt-dependencies/action.yaml +++ b/gha/apt-dependencies/action.yaml @@ -30,7 +30,7 @@ runs: with: path: | ~/apt_cache - key: ${{ runner.os }}-apt-${{ inputs.cache-version }}-${{ hashFiles('${{ format('{}{}', github.action_path, '/apt-packages.txt') }}') }} + key: ${{ runner.os }}-apt-${{ inputs.cache-version }}-${{ hashFiles( ${{format('{}{}', github.action_path, '/apt-packages.txt')}} ) }} restore-keys: | ${{ runner.os }}-apt-${{ inputs.cache-version }}- From 388292a6f03420328986800daf47852522e123ac Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:07:09 -0700 Subject: [PATCH 020/101] apt-dependencies/action.yaml: Fixed string concatenation error --- gha/apt-dependencies/action.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gha/apt-dependencies/action.yaml b/gha/apt-dependencies/action.yaml index fe57ffe9..823c5b5b 100644 --- a/gha/apt-dependencies/action.yaml +++ b/gha/apt-dependencies/action.yaml @@ -30,7 +30,7 @@ runs: with: path: | ~/apt_cache - key: ${{ runner.os }}-apt-${{ inputs.cache-version }}-${{ hashFiles( ${{format('{}{}', github.action_path, '/apt-packages.txt')}} ) }} + key: ${{ runner.os }}-apt-${{ inputs.cache-version }}-${{ hashFiles( ${{format('{0}{1}', github.action_path, '/apt-packages.txt')}} ) }} restore-keys: | ${{ runner.os }}-apt-${{ inputs.cache-version }}- @@ -38,7 +38,7 @@ runs: shell: bash env: CACHE_HIT: ${{steps.cache-apt-deps.outputs.cache-hit}} - APT_PACKAGES_FILE_PATH: ${{ format('{}{}', github.action_path, '/apt-packages.txt') }} + APT_PACKAGES_FILE_PATH: ${{ format('{0}{1}', github.action_path, '/apt-packages.txt') }} run: | if [[ "$CACHE_HIT" != 'true' ]]; then sudo apt-get -y update From 7650cd7f5485b05ebe4c220df8e6616db2f211b9 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:08:23 -0700 Subject: [PATCH 021/101] apt-dependencies/action.yaml: Fixed string concatenation error --- gha/apt-dependencies/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/apt-dependencies/action.yaml b/gha/apt-dependencies/action.yaml index 823c5b5b..e84c7742 100644 --- a/gha/apt-dependencies/action.yaml +++ b/gha/apt-dependencies/action.yaml @@ -30,7 +30,7 @@ runs: with: path: | ~/apt_cache - key: ${{ runner.os }}-apt-${{ inputs.cache-version }}-${{ hashFiles( ${{format('{0}{1}', github.action_path, '/apt-packages.txt')}} ) }} + key: ${{ runner.os }}-apt-${{ inputs.cache-version }}-${{ hashFiles( format('{0}{1}', github.action_path, '/apt-packages.txt') ) }} restore-keys: | ${{ runner.os }}-apt-${{ inputs.cache-version }}- From 669896f4f76b253bd6b92ef909f0cbca75eef8c3 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:10:00 -0700 Subject: [PATCH 022/101] apt-dependencies/action.yaml: Fixed string concatenation error --- gha/apt-dependencies/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/apt-dependencies/action.yaml b/gha/apt-dependencies/action.yaml index e84c7742..4b4c4a40 100644 --- a/gha/apt-dependencies/action.yaml +++ b/gha/apt-dependencies/action.yaml @@ -30,7 +30,7 @@ runs: with: path: | ~/apt_cache - key: ${{ runner.os }}-apt-${{ inputs.cache-version }}-${{ hashFiles( format('{0}{1}', github.action_path, '/apt-packages.txt') ) }} + key: ${{ runner.os }}-apt-${{ inputs.cache-version }}-${{ hashFiles('format('{0}{1}', github.action_path, '/apt-packages.txt')') }} restore-keys: | ${{ runner.os }}-apt-${{ inputs.cache-version }}- From ba74434af682dbf499763769a0d6c3a39f73d274 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:10:52 -0700 Subject: [PATCH 023/101] apt-dependencies/action.yaml: Fixed string concatenation error --- gha/apt-dependencies/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/apt-dependencies/action.yaml b/gha/apt-dependencies/action.yaml index 4b4c4a40..e8adbd1d 100644 --- a/gha/apt-dependencies/action.yaml +++ b/gha/apt-dependencies/action.yaml @@ -30,7 +30,7 @@ runs: with: path: | ~/apt_cache - key: ${{ runner.os }}-apt-${{ inputs.cache-version }}-${{ hashFiles('format('{0}{1}', github.action_path, '/apt-packages.txt')') }} + key: ${{ runner.os }}-apt-${{ inputs.cache-version }}-${{ hashFiles(format('{0}{1}', github.action_path, '/apt-packages.txt')) }} restore-keys: | ${{ runner.os }}-apt-${{ inputs.cache-version }}- From 541d4926bf80a8f6ce3fef4e9f75a0355b90e40b Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:12:11 -0700 Subject: [PATCH 024/101] py-dependencies/action.yaml: Changed 'input' to 'inputs' --- gha/py-dependencies/action.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index 73b6689d..fb3a76ee 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -7,7 +7,8 @@ description: | StackStorm-Exchange/ci/gha/apt-dependencies. author: StackStorm -inputs: + +s: python-version: required: true description: Which python version we should install @@ -24,10 +25,10 @@ runs: using: "composite" steps: - - name: 'Set up Python (${{ input.python-version }})' + - name: 'Set up Python (${{ inputs.python-version }})' uses: actions/setup-python@v2 with: - python-version: '${{ input.python-version }}' + python-version: '${{ inputs.python-version }}' - name: Cache Python Dependencies uses: actions/cache@v2 @@ -35,9 +36,9 @@ runs: path: | ~/.cache/pip ~/virtualenv - key: ${{ runner.os }}-python-${{ input.python-version }}-${{ input.cache-version }}-${{ hashFiles('requirements.txt') }} + key: ${{ runner.os }}-python-${{ inputs.python-version }}-${{ inputs.cache-version }}-${{ hashFiles('requirements.txt') }} restore-keys: | - ${{ runner.os }}-python-${{ input.python-version }}-${{ input.cache-version }}- + ${{ runner.os }}-python-${{ inputs.python-version }}-${{ inputs.cache-version }}- - name: Install virtualenv # this should run in the st2 checkout From aececc26cea695f2452def9d7805c5db26e97e2a Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:13:59 -0700 Subject: [PATCH 025/101] py-dependencies/action.yaml: Added numerous shell fields (using bash) --- gha/py-dependencies/action.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index fb3a76ee..a16faf3e 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -41,12 +41,14 @@ runs: ${{ runner.os }}-python-${{ inputs.python-version }}-${{ inputs.cache-version }}- - name: Install virtualenv + shell: bash # this should run in the st2 checkout working-directory: st2 run: | ./scripts/github/install-virtualenv.sh - name: Create ~/virtualenv + shell: bash id: virtualenv # this should run in the st2 checkout working-directory: st2 @@ -60,6 +62,7 @@ runs: - name: Install StackStorm requirements # this should run in the st2 checkout + shell: bash working-directory: st2 env: VIRTUALENV_DIR: "~/virtualenv" @@ -67,6 +70,7 @@ runs: ${VIRTUALENV_DIR}/bin/pip install -r requirements.txt - name: Install runners + shell: bash env: VIRTUALENV_DIR: "~/virtualenv" ACTION_PATH: ${{ github.action_path }} @@ -77,6 +81,7 @@ runs: make requirements-ci .install-runners - name: Install pack requirements + shell: bash working-directory: pack env: VIRTUALENV_DIR: "~/virtualenv" @@ -93,6 +98,7 @@ runs: fi - name: Print versions + shell: bash env: VIRTUALENV_DIR: "~/virtualenv" run: | From 167f59c0c0f38b0ff9874b7e1aff90e0a0c2fe20 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:16:39 -0700 Subject: [PATCH 026/101] py-dependencies/action.yaml: Added shell fields (using bash) --- gha/py-dependencies/action.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index a16faf3e..8249ca6b 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -26,11 +26,13 @@ runs: steps: - name: 'Set up Python (${{ inputs.python-version }})' + shell: bash uses: actions/setup-python@v2 with: python-version: '${{ inputs.python-version }}' - name: Cache Python Dependencies + shell: bash uses: actions/cache@v2 with: path: | From d54507889bf1a316e75a5d3fbf562cb661c57c80 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:18:29 -0700 Subject: [PATCH 027/101] py-dependencies/action.yaml: Removed 2 'shell' fields --- gha/py-dependencies/action.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index 8249ca6b..a16faf3e 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -26,13 +26,11 @@ runs: steps: - name: 'Set up Python (${{ inputs.python-version }})' - shell: bash uses: actions/setup-python@v2 with: python-version: '${{ inputs.python-version }}' - name: Cache Python Dependencies - shell: bash uses: actions/cache@v2 with: path: | From d85cf3e0f4ba5a5a3366f4169af4912e7badc17d Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:22:19 -0700 Subject: [PATCH 028/101] py-dependencies/action.yaml: Trying to fix 'Set up Python' step --- gha/py-dependencies/action.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index a16faf3e..df6c63b7 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -12,6 +12,7 @@ s: python-version: required: true description: Which python version we should install + default: "3.6" cache-version: required: false default: "v0" From 3603659dfc35a4b2daecfaac3c3e3d8e8b7b796c Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:24:04 -0700 Subject: [PATCH 029/101] py-dependencies/action.yaml: Added a 'shell' field (using bash) --- gha/py-dependencies/action.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index df6c63b7..bdedefb6 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -32,6 +32,7 @@ runs: python-version: '${{ inputs.python-version }}' - name: Cache Python Dependencies + shell: bash uses: actions/cache@v2 with: path: | From d5533e1f5d5aecb90a1771ce8d139de5068ca346 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:30:44 -0700 Subject: [PATCH 030/101] py-dependencies/action.yaml: Added a 'shell' field (to use bash shell) --- gha/py-dependencies/action.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index bdedefb6..4ece3248 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -27,6 +27,7 @@ runs: steps: - name: 'Set up Python (${{ inputs.python-version }})' + shell: bash uses: actions/setup-python@v2 with: python-version: '${{ inputs.python-version }}' From d0da880f29445ebf7ad8135cb698d7a98efa404e Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:31:18 -0700 Subject: [PATCH 031/101] Update action.yaml --- gha/py-dependencies/action.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index 4ece3248..bdedefb6 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -27,7 +27,6 @@ runs: steps: - name: 'Set up Python (${{ inputs.python-version }})' - shell: bash uses: actions/setup-python@v2 with: python-version: '${{ inputs.python-version }}' From 461d1e764b61b17567e5d9752ac46bcdc4ea5c34 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:33:00 -0700 Subject: [PATCH 032/101] Update action.yaml --- gha/py-dependencies/action.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index bdedefb6..df6c63b7 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -32,7 +32,6 @@ runs: python-version: '${{ inputs.python-version }}' - name: Cache Python Dependencies - shell: bash uses: actions/cache@v2 with: path: | From 0884ee6d6ed0926b5eca3ae46d25681d524cb263 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:35:40 -0700 Subject: [PATCH 033/101] Update action.yaml --- gha/py-dependencies/action.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index df6c63b7..226cdded 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -49,7 +49,6 @@ runs: ./scripts/github/install-virtualenv.sh - name: Create ~/virtualenv - shell: bash id: virtualenv # this should run in the st2 checkout working-directory: st2 From e0b20c39803a63726582aa577aa09c4790d3efee Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:36:24 -0700 Subject: [PATCH 034/101] Update action.yaml --- gha/py-dependencies/action.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index 226cdded..df6c63b7 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -49,6 +49,7 @@ runs: ./scripts/github/install-virtualenv.sh - name: Create ~/virtualenv + shell: bash id: virtualenv # this should run in the st2 checkout working-directory: st2 From 8f71809d5d6720b5b63c5e0bf1d49d483473d4a3 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:39:27 -0700 Subject: [PATCH 035/101] test/action.yaml: Added 'shell' fields (to use bash shell) and fixed string concatenation error --- gha/test/action.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gha/test/action.yaml b/gha/test/action.yaml index e8772d0e..49734d74 100644 --- a/gha/test/action.yaml +++ b/gha/test/action.yaml @@ -25,6 +25,7 @@ runs: steps: - name: Get Pack Name + shell: bash id: pack-name env: VIRTUALENV_DIR: "~/virtualenv" @@ -37,12 +38,13 @@ runs: fi echo "::set-output name=pack-name::${PACK_NAME}" - - name: + - name: + shell: bash env: VIRTUALENV_DIR: "~/virtualenv" FORCE_CHECK_ALL_FILES: true if on default branch ROOT_DIR: pack directory - CI_DIR: ${{ github.action_path + "/../.." }} + CI_DIR: ${{ format('{0}{1}', github.action_path, "/../..") }} ST2_REPO_PATH: st2 directory ENABLE_COMMON_LIBS: ${{ input.enable-common-libs }} # TODO: This Makefile has CircleCI assumptions From bf2d67306f509d8373e7ecffcd933c6f8f615d9b Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:40:29 -0700 Subject: [PATCH 036/101] Update action.yaml --- gha/test/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/test/action.yaml b/gha/test/action.yaml index 49734d74..46db7ed5 100644 --- a/gha/test/action.yaml +++ b/gha/test/action.yaml @@ -44,7 +44,7 @@ runs: VIRTUALENV_DIR: "~/virtualenv" FORCE_CHECK_ALL_FILES: true if on default branch ROOT_DIR: pack directory - CI_DIR: ${{ format('{0}{1}', github.action_path, "/../..") }} + CI_DIR: ${{ format('{0}{1}', github.action_path, '/../..') }} ST2_REPO_PATH: st2 directory ENABLE_COMMON_LIBS: ${{ input.enable-common-libs }} # TODO: This Makefile has CircleCI assumptions From 53aa05a486c5c33e01a243bc0d8278d4c8ea1fb8 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:40:49 -0700 Subject: [PATCH 037/101] Update action.yaml --- gha/test/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/test/action.yaml b/gha/test/action.yaml index 46db7ed5..2e00b4a6 100644 --- a/gha/test/action.yaml +++ b/gha/test/action.yaml @@ -46,7 +46,7 @@ runs: ROOT_DIR: pack directory CI_DIR: ${{ format('{0}{1}', github.action_path, '/../..') }} ST2_REPO_PATH: st2 directory - ENABLE_COMMON_LIBS: ${{ input.enable-common-libs }} + ENABLE_COMMON_LIBS: ${{ inputs.enable-common-libs }} # TODO: This Makefile has CircleCI assumptions run: | if [[ "true" == "${ENABLE_COMMON_LIBS}" ]]; then From b636b82fa15a0529e7d52672aed60005a04c4542 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:46:02 -0700 Subject: [PATCH 038/101] py-dependencies/action.yaml: Commented out a duplicate step "Create ~/virtualenv" --- gha/py-dependencies/action.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index df6c63b7..8f4c471e 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -41,12 +41,12 @@ runs: restore-keys: | ${{ runner.os }}-python-${{ inputs.python-version }}-${{ inputs.cache-version }}- - - name: Install virtualenv - shell: bash - # this should run in the st2 checkout - working-directory: st2 - run: | - ./scripts/github/install-virtualenv.sh +# - name: Install virtualenv +# shell: bash +# # this should run in the st2 checkout +# working-directory: st2 +# run: | +# ./scripts/github/install-virtualenv.sh - name: Create ~/virtualenv shell: bash From fbc7841f8566e0805603a2a7ac23081087c22467 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:52:51 -0700 Subject: [PATCH 039/101] py-dependencies/action.yaml: Fixed environment variable syntax --- gha/py-dependencies/action.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index 8f4c471e..0a58a4f1 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -59,7 +59,7 @@ runs: ./scripts/github/install-virtualenv.sh PIP_VERSION=$(grep '^PIP_VERSION' Makefile | awk '{print $3}') echo "::set-output name=pip-version::${PIP_VERSION}" - ${VIRTUALENV_DIR}/bin/pip install -U "pip==${PIP_VERSION}" setuptools + ${{env.VIRTUALENV_DIR}}/bin/pip install -U "pip==${PIP_VERSION}" setuptools - name: Install StackStorm requirements # this should run in the st2 checkout @@ -68,7 +68,7 @@ runs: env: VIRTUALENV_DIR: "~/virtualenv" run: | - ${VIRTUALENV_DIR}/bin/pip install -r requirements.txt + ${{env.VIRTUALENV_DIR}}/bin/pip install -r requirements.txt - name: Install runners shell: bash From 6fea37bbf084928798a0700981b4ff9d13d4d60f Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:54:58 -0700 Subject: [PATCH 040/101] py-dependencies/action.yaml: Fixed environment variable syntax --- gha/py-dependencies/action.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index 0a58a4f1..8921f1b2 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -78,7 +78,7 @@ runs: ST2_REPO_PATH: st2 # TODO: This Makefile has CircleCI assumptions run: | - cp ${ACTION_PATH}/../../.circle/Makefile . + cp ${{env.ACTION_PATH}}/../../.circle/Makefile . make requirements-ci .install-runners - name: Install pack requirements @@ -89,13 +89,13 @@ runs: PACK_REQUIREMENTS_FILE: requirements.txt PACK_TESTS_REQUIREMENTS_FILE: requirements-tests.txt run: | - if [[ -f "${PACK_REQUIREMENTS_FILE}" ]]; then - echo "Installing pack requirements from ${PACK_REQUIREMENTS_FILE}" - ${VIRTUALENV_DIR}/bin/pip install -r "${PACK_REQUIREMENTS_FILE}" + if [[ -f "${{env.PACK_REQUIREMENTS_FILE}}" ]]; then + echo "Installing pack requirements from ${{env.PACK_REQUIREMENTS_FILE}}" + ${VIRTUALENV_DIR}/bin/pip install -r "${{env.PACK_REQUIREMENTS_FILE}}" fi - if [[ -f "${PACK_TESTS_REQUIREMENTS_FILE}" ]]; then - echo "Installing pack tests requirements from ${PACK_TESTS_REQUIREMENTS_FILE}" - ${VIRTUALENV_DIR}/bin/pip install -r "${PACK_TESTS_REQUIREMENTS_FILE}" + if [[ -f "${{env.PACK_TESTS_REQUIREMENTS_FILE}}" ]]; then + echo "Installing pack tests requirements from ${{env.PACK_TESTS_REQUIREMENTS_FILE}}" + ${{env.VIRTUALENV_DIR}}/bin/pip install -r "${{env.PACK_TESTS_REQUIREMENTS_FILE}}" fi - name: Print versions @@ -104,7 +104,7 @@ runs: VIRTUALENV_DIR: "~/virtualenv" run: | set -ex - source ${VIRTUALENV_DIR}/activate + source ${{env.VIRTUALENV_DIR}}/activate python3 --version pip --version virtualenv --version From ed3e6a47539e60a05c7ad0ae34f0158e35c70ca8 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 12:09:25 -0700 Subject: [PATCH 041/101] Update action.yaml --- gha/py-dependencies/action.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index 8921f1b2..d123d61b 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -79,6 +79,7 @@ runs: # TODO: This Makefile has CircleCI assumptions run: | cp ${{env.ACTION_PATH}}/../../.circle/Makefile . + cp -R ${{env.ACTION_PATH}}/../../utils ./../../utils make requirements-ci .install-runners - name: Install pack requirements From 87cab81ca56b6da3697723e86e91eab1e09947cc Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 12:12:50 -0700 Subject: [PATCH 042/101] Update action.yaml --- gha/py-dependencies/action.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index d123d61b..8921f1b2 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -79,7 +79,6 @@ runs: # TODO: This Makefile has CircleCI assumptions run: | cp ${{env.ACTION_PATH}}/../../.circle/Makefile . - cp -R ${{env.ACTION_PATH}}/../../utils ./../../utils make requirements-ci .install-runners - name: Install pack requirements From 7d49de2191ffc803d63bbf3d98b6733796d411df Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 12:15:03 -0700 Subject: [PATCH 043/101] Update action.yaml --- gha/py-dependencies/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index 8921f1b2..a4acbfe2 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -78,7 +78,7 @@ runs: ST2_REPO_PATH: st2 # TODO: This Makefile has CircleCI assumptions run: | - cp ${{env.ACTION_PATH}}/../../.circle/Makefile . + cp ${{env.ACTION_PATH}}/../../../.circle/Makefile . make requirements-ci .install-runners - name: Install pack requirements From 59d5d3ec9f3cc6311773c39e1f85d812df844137 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 12:19:33 -0700 Subject: [PATCH 044/101] Update action.yaml --- gha/py-dependencies/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index a4acbfe2..8921f1b2 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -78,7 +78,7 @@ runs: ST2_REPO_PATH: st2 # TODO: This Makefile has CircleCI assumptions run: | - cp ${{env.ACTION_PATH}}/../../../.circle/Makefile . + cp ${{env.ACTION_PATH}}/../../.circle/Makefile . make requirements-ci .install-runners - name: Install pack requirements From 88532b6ec87d148f26b652dda4e1184f81326f25 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 12:26:48 -0700 Subject: [PATCH 045/101] Update action.yaml --- gha/py-dependencies/action.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index 8921f1b2..bd3313d4 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -78,7 +78,8 @@ runs: ST2_REPO_PATH: st2 # TODO: This Makefile has CircleCI assumptions run: | - cp ${{env.ACTION_PATH}}/../../.circle/Makefile . + cp -R -v ${{env.ACTION_PATH}}/../../utils ./utils + cp -v ${{env.ACTION_PATH}}/../../.circle/Makefile . make requirements-ci .install-runners - name: Install pack requirements From 497f9ada357b35fd384a402e4cf995e6aecf5467 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 12:30:08 -0700 Subject: [PATCH 046/101] Update action.yaml --- gha/py-dependencies/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index bd3313d4..a916a828 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -78,7 +78,7 @@ runs: ST2_REPO_PATH: st2 # TODO: This Makefile has CircleCI assumptions run: | - cp -R -v ${{env.ACTION_PATH}}/../../utils ./utils + cp -R -v ${{env.ACTION_PATH}}/../../utils ~/bin/sh/utils cp -v ${{env.ACTION_PATH}}/../../.circle/Makefile . make requirements-ci .install-runners From be188eee3ab14cc25d7150cc698f115c41a7ff96 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 12:35:35 -0700 Subject: [PATCH 047/101] Update action.yaml --- gha/py-dependencies/action.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index a916a828..1f3c3086 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -78,6 +78,7 @@ runs: ST2_REPO_PATH: st2 # TODO: This Makefile has CircleCI assumptions run: | + mkdir ~/bin/sh/utils cp -R -v ${{env.ACTION_PATH}}/../../utils ~/bin/sh/utils cp -v ${{env.ACTION_PATH}}/../../.circle/Makefile . make requirements-ci .install-runners From fb5c4716b08ea16e0e4871467260657f1e4e69cc Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 12:39:43 -0700 Subject: [PATCH 048/101] Update action.yaml --- gha/py-dependencies/action.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index 1f3c3086..0f7936bb 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -78,8 +78,8 @@ runs: ST2_REPO_PATH: st2 # TODO: This Makefile has CircleCI assumptions run: | - mkdir ~/bin/sh/utils - cp -R -v ${{env.ACTION_PATH}}/../../utils ~/bin/sh/utils +# mkdir ~/bin/sh/utils +# cp -R -v ${{env.ACTION_PATH}}/../../utils ~/bin/sh/utils cp -v ${{env.ACTION_PATH}}/../../.circle/Makefile . make requirements-ci .install-runners From 994a33b001e55382d24f8155ce333fb2808bde8e Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 12:41:54 -0700 Subject: [PATCH 049/101] Update action.yaml --- gha/py-dependencies/action.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index 0f7936bb..cacc1091 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -78,8 +78,6 @@ runs: ST2_REPO_PATH: st2 # TODO: This Makefile has CircleCI assumptions run: | -# mkdir ~/bin/sh/utils -# cp -R -v ${{env.ACTION_PATH}}/../../utils ~/bin/sh/utils cp -v ${{env.ACTION_PATH}}/../../.circle/Makefile . make requirements-ci .install-runners From 6bea5117fc3eb83ac7fb3667f250916d3cce15ae Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 12:51:06 -0700 Subject: [PATCH 050/101] Update Makefile --- .circle/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circle/Makefile b/.circle/Makefile index 315c7d49..e7b37fd7 100644 --- a/.circle/Makefile +++ b/.circle/Makefile @@ -1,5 +1,5 @@ ROOT_DIR ?= $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) -NUM_CHANGED_FILES := $(shell $(CI_DIR)/utils/git-changes files | wc -w) +NUM_CHANGED_FILES := $(shell $(env.ACTION_PATH)/../../utils/git-changes files | wc -w) NUM_CHANGED_PY := $(shell $(CI_DIR)/utils/git-changes py | wc -w) NUM_CHANGED_YAML := $(shell $(CI_DIR)/utils/git-changes yaml | wc -w) NUM_CHANGED_JSON := $(shell $(CI_DIR)/utils/git-changes json | wc -w) @@ -293,7 +293,7 @@ requirements-ci: @echo "==================== requirements-ci ====================" @echo . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --upgrade "pip==20.3.3" - . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(CI_DIR)/.circle/requirements-dev.txt +# . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(CI_DIR)/.circle/requirements-dev.txt . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(CI_DIR)/.circle/requirements-pack-tests.txt .PHONY: virtualenv From 7e1012d04e33e6c63f60d1220efd3ad8e3c45bc6 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 12:53:57 -0700 Subject: [PATCH 051/101] Update Makefile --- .circle/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circle/Makefile b/.circle/Makefile index e7b37fd7..3ab81f69 100644 --- a/.circle/Makefile +++ b/.circle/Makefile @@ -1,5 +1,5 @@ ROOT_DIR ?= $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) -NUM_CHANGED_FILES := $(shell $(env.ACTION_PATH)/../../utils/git-changes files | wc -w) +NUM_CHANGED_FILES := $(shell $(CI_DIR)/utils/git-changes files | wc -w) NUM_CHANGED_PY := $(shell $(CI_DIR)/utils/git-changes py | wc -w) NUM_CHANGED_YAML := $(shell $(CI_DIR)/utils/git-changes yaml | wc -w) NUM_CHANGED_JSON := $(shell $(CI_DIR)/utils/git-changes json | wc -w) From 32816a97b1b8da27bfc226ce24870910b5fbaa5d Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 12:55:48 -0700 Subject: [PATCH 052/101] Update Makefile --- .circle/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circle/Makefile b/.circle/Makefile index 3ab81f69..04a202e1 100644 --- a/.circle/Makefile +++ b/.circle/Makefile @@ -293,7 +293,7 @@ requirements-ci: @echo "==================== requirements-ci ====================" @echo . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --upgrade "pip==20.3.3" -# . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(CI_DIR)/.circle/requirements-dev.txt + . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r ./.circle/requirements-dev.txt . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(CI_DIR)/.circle/requirements-pack-tests.txt .PHONY: virtualenv From 5fb84683d413498cca60637b1f5a875f62e846b5 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 13:00:07 -0700 Subject: [PATCH 053/101] Update Makefile --- .circle/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circle/Makefile b/.circle/Makefile index 04a202e1..d39191f4 100644 --- a/.circle/Makefile +++ b/.circle/Makefile @@ -1,5 +1,5 @@ ROOT_DIR ?= $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) -NUM_CHANGED_FILES := $(shell $(CI_DIR)/utils/git-changes files | wc -w) +NUM_CHANGED_FILES := $(shell /home/runner/work/_actions/lm-ydubler/ci/gha/utils/git-changes files | wc -w) NUM_CHANGED_PY := $(shell $(CI_DIR)/utils/git-changes py | wc -w) NUM_CHANGED_YAML := $(shell $(CI_DIR)/utils/git-changes yaml | wc -w) NUM_CHANGED_JSON := $(shell $(CI_DIR)/utils/git-changes json | wc -w) @@ -293,7 +293,7 @@ requirements-ci: @echo "==================== requirements-ci ====================" @echo . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --upgrade "pip==20.3.3" - . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r ./.circle/requirements-dev.txt + . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r /home/runner/work/_actions/lm-ydubler/ci/gha/.circle/requirements-dev.txt . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(CI_DIR)/.circle/requirements-pack-tests.txt .PHONY: virtualenv From efea9f4dafe4e5748de15043ed04dfaa545e7c7e Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 13:05:24 -0700 Subject: [PATCH 054/101] Update action.yaml --- gha/py-dependencies/action.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index cacc1091..fb1f0390 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -78,6 +78,7 @@ runs: ST2_REPO_PATH: st2 # TODO: This Makefile has CircleCI assumptions run: | + /home/runner/virtualenv/bin/python -m pip install --upgrade pip cp -v ${{env.ACTION_PATH}}/../../.circle/Makefile . make requirements-ci .install-runners From f82845c751dee6044d7cfe559b00206a2bb93160 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 13:10:30 -0700 Subject: [PATCH 055/101] Update Makefile --- .circle/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circle/Makefile b/.circle/Makefile index d39191f4..3b75cab5 100644 --- a/.circle/Makefile +++ b/.circle/Makefile @@ -292,7 +292,7 @@ requirements-ci: @echo @echo "==================== requirements-ci ====================" @echo - . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --upgrade "pip==20.3.3" + . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --upgrade "pip==21.3.1" . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r /home/runner/work/_actions/lm-ydubler/ci/gha/.circle/requirements-dev.txt . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(CI_DIR)/.circle/requirements-pack-tests.txt From 11f75e29120b0b46955829072793bd9639d46d95 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 13:11:08 -0700 Subject: [PATCH 056/101] Update action.yaml --- gha/py-dependencies/action.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index fb1f0390..cacc1091 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -78,7 +78,6 @@ runs: ST2_REPO_PATH: st2 # TODO: This Makefile has CircleCI assumptions run: | - /home/runner/virtualenv/bin/python -m pip install --upgrade pip cp -v ${{env.ACTION_PATH}}/../../.circle/Makefile . make requirements-ci .install-runners From 6cb9957e714c3d83206398052fa1c233d4ef3950 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 13:19:00 -0700 Subject: [PATCH 057/101] Update Makefile --- .circle/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circle/Makefile b/.circle/Makefile index 3b75cab5..315c7d49 100644 --- a/.circle/Makefile +++ b/.circle/Makefile @@ -1,5 +1,5 @@ ROOT_DIR ?= $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) -NUM_CHANGED_FILES := $(shell /home/runner/work/_actions/lm-ydubler/ci/gha/utils/git-changes files | wc -w) +NUM_CHANGED_FILES := $(shell $(CI_DIR)/utils/git-changes files | wc -w) NUM_CHANGED_PY := $(shell $(CI_DIR)/utils/git-changes py | wc -w) NUM_CHANGED_YAML := $(shell $(CI_DIR)/utils/git-changes yaml | wc -w) NUM_CHANGED_JSON := $(shell $(CI_DIR)/utils/git-changes json | wc -w) @@ -292,8 +292,8 @@ requirements-ci: @echo @echo "==================== requirements-ci ====================" @echo - . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --upgrade "pip==21.3.1" - . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r /home/runner/work/_actions/lm-ydubler/ci/gha/.circle/requirements-dev.txt + . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --upgrade "pip==20.3.3" + . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(CI_DIR)/.circle/requirements-dev.txt . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(CI_DIR)/.circle/requirements-pack-tests.txt .PHONY: virtualenv From b8a20304afda2fe07b1e7cb778fd8be23821a9dd Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 13:53:15 -0700 Subject: [PATCH 058/101] Update Makefile --- .circle/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circle/Makefile b/.circle/Makefile index 315c7d49..c51a5fdd 100644 --- a/.circle/Makefile +++ b/.circle/Makefile @@ -1,5 +1,5 @@ ROOT_DIR ?= $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) -NUM_CHANGED_FILES := $(shell $(CI_DIR)/utils/git-changes files | wc -w) +NUM_CHANGED_FILES := $(shell /home/runner/work/_actions/lm-ydubler/ci/gha/utils/git-changes files | wc -w) NUM_CHANGED_PY := $(shell $(CI_DIR)/utils/git-changes py | wc -w) NUM_CHANGED_YAML := $(shell $(CI_DIR)/utils/git-changes yaml | wc -w) NUM_CHANGED_JSON := $(shell $(CI_DIR)/utils/git-changes json | wc -w) @@ -293,7 +293,7 @@ requirements-ci: @echo "==================== requirements-ci ====================" @echo . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --upgrade "pip==20.3.3" - . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(CI_DIR)/.circle/requirements-dev.txt + . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r /home/runner/work/_actions/lm-ydubler/ci/gha/.circle/requirements-dev.txt . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(CI_DIR)/.circle/requirements-pack-tests.txt .PHONY: virtualenv From 0ae640b3fe18d1490a2e4051bf0d02f01e2be7d6 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 14:32:32 -0700 Subject: [PATCH 059/101] Update Makefile --- .circle/Makefile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.circle/Makefile b/.circle/Makefile index c51a5fdd..04c99dc9 100644 --- a/.circle/Makefile +++ b/.circle/Makefile @@ -1,9 +1,13 @@ ROOT_DIR ?= $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) -NUM_CHANGED_FILES := $(shell /home/runner/work/_actions/lm-ydubler/ci/gha/utils/git-changes files | wc -w) -NUM_CHANGED_PY := $(shell $(CI_DIR)/utils/git-changes py | wc -w) -NUM_CHANGED_YAML := $(shell $(CI_DIR)/utils/git-changes yaml | wc -w) -NUM_CHANGED_JSON := $(shell $(CI_DIR)/utils/git-changes json | wc -w) -CHANGED_DIRECTORIES := $(shell $(CI_DIR)/utils/git-changes directories) +#NUM_CHANGED_PY := $(shell $(CI_DIR)/utils/git-changes py | wc -w) +#NUM_CHANGED_YAML := $(shell $(CI_DIR)/utils/git-changes yaml | wc -w) +#NUM_CHANGED_JSON := $(shell $(CI_DIR)/utils/git-changes json | wc -w) +#CHANGED_DIRECTORIES := $(shell $(CI_DIR)/utils/git-changes directories) +NUM_CHANGED_FILES := $(shell /home/runner/work/_actions/lm-ydubler/ci/gha/utils/git-changes-files | wc -w) +NUM_CHANGED_PY := $(shell /home/runner/work/_actions/lm-ydubler/ci/gha/utils/git-changes-py | wc -w) +NUM_CHANGED_YAML := $(shell /home/runner/work/_actions/lm-ydubler/ci/gha/utils/git-changes-yaml | wc -w) +NUM_CHANGED_JSON := $(shell /home/runner/work/_actions/lm-ydubler/ci/gha/utils/git-changes-json | wc -w) +CHANGED_DIRECTORIES := $(shell /home/runner/work/_actions/lm-ydubler/ci/gha/utils/git-changes-directories) VIRTUALENV_DIR ?= virtualenv ST2_REPO_PATH ?= /tmp/st2 ST2_REPO_BRANCH ?= master @@ -294,7 +298,7 @@ requirements-ci: @echo . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --upgrade "pip==20.3.3" . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r /home/runner/work/_actions/lm-ydubler/ci/gha/.circle/requirements-dev.txt - . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(CI_DIR)/.circle/requirements-pack-tests.txt + . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r /home/runner/work/_actions/lm-ydubler/ci/gha/.circle/.circle/requirements-pack-tests.txt .PHONY: virtualenv virtualenv: $(VIRTUALENV_DIR)/bin/activate From 6d81099117aa515818d4c31b7d57f5763d2af175 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 14:33:00 -0700 Subject: [PATCH 060/101] Update Makefile --- .circle/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circle/Makefile b/.circle/Makefile index 04c99dc9..e2b74bf3 100644 --- a/.circle/Makefile +++ b/.circle/Makefile @@ -298,7 +298,7 @@ requirements-ci: @echo . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --upgrade "pip==20.3.3" . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r /home/runner/work/_actions/lm-ydubler/ci/gha/.circle/requirements-dev.txt - . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r /home/runner/work/_actions/lm-ydubler/ci/gha/.circle/.circle/requirements-pack-tests.txt + . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r /home/runner/work/_actions/lm-ydubler/ci/gha/.circle/requirements-pack-tests.txt .PHONY: virtualenv virtualenv: $(VIRTUALENV_DIR)/bin/activate From edf07a476c9562ddbbf9554c432e067137ecb723 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 14:49:05 -0700 Subject: [PATCH 061/101] Update Makefile --- .circle/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circle/Makefile b/.circle/Makefile index e2b74bf3..a31259b0 100644 --- a/.circle/Makefile +++ b/.circle/Makefile @@ -296,7 +296,7 @@ requirements-ci: @echo @echo "==================== requirements-ci ====================" @echo - . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --upgrade "pip==20.3.3" + . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --upgrade "pip==21.3.1" . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r /home/runner/work/_actions/lm-ydubler/ci/gha/.circle/requirements-dev.txt . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r /home/runner/work/_actions/lm-ydubler/ci/gha/.circle/requirements-pack-tests.txt From c74aebe6dd9babdc885ec9e64a395efcfd1e0d3e Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 14:55:28 -0700 Subject: [PATCH 062/101] Update action.yaml --- gha/py-dependencies/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index cacc1091..09ddff6e 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -91,7 +91,7 @@ runs: run: | if [[ -f "${{env.PACK_REQUIREMENTS_FILE}}" ]]; then echo "Installing pack requirements from ${{env.PACK_REQUIREMENTS_FILE}}" - ${VIRTUALENV_DIR}/bin/pip install -r "${{env.PACK_REQUIREMENTS_FILE}}" + ${{env.VIRTUALENV_DIR}}/bin/pip install -r "${{env.PACK_REQUIREMENTS_FILE}}" fi if [[ -f "${{env.PACK_TESTS_REQUIREMENTS_FILE}}" ]]; then echo "Installing pack tests requirements from ${{env.PACK_TESTS_REQUIREMENTS_FILE}}" From 2655930e9fb500d12921705601a791743ddb2769 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 15:05:34 -0700 Subject: [PATCH 063/101] Update action.yaml --- gha/py-dependencies/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index 09ddff6e..2160ff48 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -104,7 +104,7 @@ runs: VIRTUALENV_DIR: "~/virtualenv" run: | set -ex - source ${{env.VIRTUALENV_DIR}}/activate + source ${{env.VIRTUALENV_DIR}}/bin/activate python3 --version pip --version virtualenv --version From 7cb6f4baa428bfe467f42d594ce3aad4e8607746 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 15:35:24 -0700 Subject: [PATCH 064/101] Update action.yaml --- gha/apt-dependencies/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/apt-dependencies/action.yaml b/gha/apt-dependencies/action.yaml index e8adbd1d..60a6b805 100644 --- a/gha/apt-dependencies/action.yaml +++ b/gha/apt-dependencies/action.yaml @@ -43,7 +43,7 @@ runs: if [[ "$CACHE_HIT" != 'true' ]]; then sudo apt-get -y update fi - APT_PACKAGES=$(grep -v '^#' "${APT_PACKAGES_FILE_PATH}" | xargs echo -n) + APT_PACKAGES=$(grep -v '^#' "${{env.APT_PACKAGES_FILE_PATH}}" | xargs echo -n) sudo apt-get -y install ${APT_PACKAGES} - name: Print versions From b75d325a27745675970219d817526707086045c5 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 15:38:44 -0700 Subject: [PATCH 065/101] Update Makefile --- .circle/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circle/Makefile b/.circle/Makefile index a31259b0..e2b74bf3 100644 --- a/.circle/Makefile +++ b/.circle/Makefile @@ -296,7 +296,7 @@ requirements-ci: @echo @echo "==================== requirements-ci ====================" @echo - . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --upgrade "pip==21.3.1" + . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --upgrade "pip==20.3.3" . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r /home/runner/work/_actions/lm-ydubler/ci/gha/.circle/requirements-dev.txt . $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r /home/runner/work/_actions/lm-ydubler/ci/gha/.circle/requirements-pack-tests.txt From c8a13bcaf4f9ae212270502be2ef63ff7f9ece7a Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Mon, 22 Nov 2021 15:52:59 -0700 Subject: [PATCH 066/101] Update action.yaml --- gha/py-dependencies/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index 2160ff48..d7e8332c 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -78,7 +78,7 @@ runs: ST2_REPO_PATH: st2 # TODO: This Makefile has CircleCI assumptions run: | - cp -v ${{env.ACTION_PATH}}/../../.circle/Makefile . + cp ${{env.ACTION_PATH}}/../../.circle/Makefile . make requirements-ci .install-runners - name: Install pack requirements From 1f43c02d75d32c2d030361092a6dd3ebefc3a572 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 08:48:32 -0700 Subject: [PATCH 067/101] Update action.yaml --- gha/py-dependencies/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index d7e8332c..a1df8516 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -8,7 +8,7 @@ description: | author: StackStorm -s: +inputs: python-version: required: true description: Which python version we should install From 53b0d57c82742779f970be94b1090336afea219b Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 08:56:23 -0700 Subject: [PATCH 068/101] Update action.yaml --- gha/checkout/action.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gha/checkout/action.yaml b/gha/checkout/action.yaml index 8f0e065f..2eca2cac 100644 --- a/gha/checkout/action.yaml +++ b/gha/checkout/action.yaml @@ -28,8 +28,8 @@ runs: GIT_USER_NAME: "${{ inputs.git_user_name }}" GIT_USER_EMAIL: "${{ inputs.git_user_email }}" run: | - git config --global user.name "${GIT_USER_NAME}" - git config --global user.email "${GIT_USER_EMAIL}" + git config --global user.name "${{env.GIT_USER_NAME}}" + git config --global user.email "${{env.GIT_USER_EMAIL}}" - name: Checkout pack repo uses: actions/checkout@v2 From 1dd2455f4e3e2461c19378509443b3c6de9d3f2f Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 09:09:35 -0700 Subject: [PATCH 069/101] Update action.yaml --- gha/apt-dependencies/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/apt-dependencies/action.yaml b/gha/apt-dependencies/action.yaml index 60a6b805..1a96b1f5 100644 --- a/gha/apt-dependencies/action.yaml +++ b/gha/apt-dependencies/action.yaml @@ -40,7 +40,7 @@ runs: CACHE_HIT: ${{steps.cache-apt-deps.outputs.cache-hit}} APT_PACKAGES_FILE_PATH: ${{ format('{0}{1}', github.action_path, '/apt-packages.txt') }} run: | - if [[ "$CACHE_HIT" != 'true' ]]; then + if [[ "${{env.CACHE_HIT}}" != 'true' ]]; then sudo apt-get -y update fi APT_PACKAGES=$(grep -v '^#' "${{env.APT_PACKAGES_FILE_PATH}}" | xargs echo -n) From fd560d3277470b60bab69f542d136b81cd86a037 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 09:18:13 -0700 Subject: [PATCH 070/101] Update action.yaml --- gha/checkout/action.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gha/checkout/action.yaml b/gha/checkout/action.yaml index 2eca2cac..8f0e065f 100644 --- a/gha/checkout/action.yaml +++ b/gha/checkout/action.yaml @@ -28,8 +28,8 @@ runs: GIT_USER_NAME: "${{ inputs.git_user_name }}" GIT_USER_EMAIL: "${{ inputs.git_user_email }}" run: | - git config --global user.name "${{env.GIT_USER_NAME}}" - git config --global user.email "${{env.GIT_USER_EMAIL}}" + git config --global user.name "${GIT_USER_NAME}" + git config --global user.email "${GIT_USER_EMAIL}" - name: Checkout pack repo uses: actions/checkout@v2 From 54edeb2b2910c5330fcb32b3aef490e54066e4f5 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 09:19:15 -0700 Subject: [PATCH 071/101] Update action.yaml --- gha/apt-dependencies/action.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gha/apt-dependencies/action.yaml b/gha/apt-dependencies/action.yaml index 1a96b1f5..85546c5f 100644 --- a/gha/apt-dependencies/action.yaml +++ b/gha/apt-dependencies/action.yaml @@ -38,12 +38,12 @@ runs: shell: bash env: CACHE_HIT: ${{steps.cache-apt-deps.outputs.cache-hit}} - APT_PACKAGES_FILE_PATH: ${{ format('{0}{1}', github.action_path, '/apt-packages.txt') }} + APT_PACKAGES_FILE_PATH: ${{ format('{0}{1}', ${{github.action_path}}, '/apt-packages.txt') }} run: | - if [[ "${{env.CACHE_HIT}}" != 'true' ]]; then + if [[ "${CACHE_HIT}" != 'true' ]]; then sudo apt-get -y update fi - APT_PACKAGES=$(grep -v '^#' "${{env.APT_PACKAGES_FILE_PATH}}" | xargs echo -n) + APT_PACKAGES=$(grep -v '^#' "${APT_PACKAGES_FILE_PATH}" | xargs echo -n) sudo apt-get -y install ${APT_PACKAGES} - name: Print versions From 067efd0d2e5dc90b595e3414590456fbf7c6b39a Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 09:21:25 -0700 Subject: [PATCH 072/101] Update action.yaml --- gha/apt-dependencies/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/apt-dependencies/action.yaml b/gha/apt-dependencies/action.yaml index 85546c5f..d22f4b41 100644 --- a/gha/apt-dependencies/action.yaml +++ b/gha/apt-dependencies/action.yaml @@ -38,7 +38,7 @@ runs: shell: bash env: CACHE_HIT: ${{steps.cache-apt-deps.outputs.cache-hit}} - APT_PACKAGES_FILE_PATH: ${{ format('{0}{1}', ${{github.action_path}}, '/apt-packages.txt') }} + APT_PACKAGES_FILE_PATH: ${{ format('{0}{1}', github.action_path, '/apt-packages.txt') }} run: | if [[ "${CACHE_HIT}" != 'true' ]]; then sudo apt-get -y update From 3129a27f99fb99e274f1c8d29efd35ce59343577 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 09:22:20 -0700 Subject: [PATCH 073/101] Update action.yaml --- gha/apt-dependencies/action.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/gha/apt-dependencies/action.yaml b/gha/apt-dependencies/action.yaml index d22f4b41..9326d692 100644 --- a/gha/apt-dependencies/action.yaml +++ b/gha/apt-dependencies/action.yaml @@ -40,6 +40,7 @@ runs: CACHE_HIT: ${{steps.cache-apt-deps.outputs.cache-hit}} APT_PACKAGES_FILE_PATH: ${{ format('{0}{1}', github.action_path, '/apt-packages.txt') }} run: | + echo -e '\n\nAPT_PACKAGES_FILE_PATH=${APT_PACKAGES_FILE_PATH} <--------------------\n\n' if [[ "${CACHE_HIT}" != 'true' ]]; then sudo apt-get -y update fi From f6155ecbb2b39ed4725f5f26b9dd6e699040cd46 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 09:25:12 -0700 Subject: [PATCH 074/101] Update action.yaml --- gha/apt-dependencies/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/apt-dependencies/action.yaml b/gha/apt-dependencies/action.yaml index 9326d692..a6976beb 100644 --- a/gha/apt-dependencies/action.yaml +++ b/gha/apt-dependencies/action.yaml @@ -40,11 +40,11 @@ runs: CACHE_HIT: ${{steps.cache-apt-deps.outputs.cache-hit}} APT_PACKAGES_FILE_PATH: ${{ format('{0}{1}', github.action_path, '/apt-packages.txt') }} run: | - echo -e '\n\nAPT_PACKAGES_FILE_PATH=${APT_PACKAGES_FILE_PATH} <--------------------\n\n' if [[ "${CACHE_HIT}" != 'true' ]]; then sudo apt-get -y update fi APT_PACKAGES=$(grep -v '^#' "${APT_PACKAGES_FILE_PATH}" | xargs echo -n) + echo -e '\n\nAPT_PACKAGES_FILE_PATH=${APT_PACKAGES_FILE_PATH} <--------------------\n\n' sudo apt-get -y install ${APT_PACKAGES} - name: Print versions From 3da2fe9fe7b023cd1dfb350c1c9b53fc1c390aca Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 09:26:24 -0700 Subject: [PATCH 075/101] Update action.yaml --- gha/apt-dependencies/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/apt-dependencies/action.yaml b/gha/apt-dependencies/action.yaml index a6976beb..4c82bf38 100644 --- a/gha/apt-dependencies/action.yaml +++ b/gha/apt-dependencies/action.yaml @@ -44,7 +44,7 @@ runs: sudo apt-get -y update fi APT_PACKAGES=$(grep -v '^#' "${APT_PACKAGES_FILE_PATH}" | xargs echo -n) - echo -e '\n\nAPT_PACKAGES_FILE_PATH=${APT_PACKAGES_FILE_PATH} <--------------------\n\n' + echo APT_PACKAGES_FILE_PATH=${APT_PACKAGES_FILE_PATH} sudo apt-get -y install ${APT_PACKAGES} - name: Print versions From d399d83b3aefd2b99387d7ffca9ac309553df4d9 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 09:30:04 -0700 Subject: [PATCH 076/101] Update action.yaml --- gha/py-dependencies/action.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index a1df8516..31889168 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -59,7 +59,7 @@ runs: ./scripts/github/install-virtualenv.sh PIP_VERSION=$(grep '^PIP_VERSION' Makefile | awk '{print $3}') echo "::set-output name=pip-version::${PIP_VERSION}" - ${{env.VIRTUALENV_DIR}}/bin/pip install -U "pip==${PIP_VERSION}" setuptools + ${VIRTUALENV_DIR}/bin/pip install -U "pip==${PIP_VERSION}" setuptools - name: Install StackStorm requirements # this should run in the st2 checkout @@ -68,7 +68,7 @@ runs: env: VIRTUALENV_DIR: "~/virtualenv" run: | - ${{env.VIRTUALENV_DIR}}/bin/pip install -r requirements.txt + ${VIRTUALENV_DIR}/bin/pip install -r requirements.txt - name: Install runners shell: bash @@ -78,7 +78,7 @@ runs: ST2_REPO_PATH: st2 # TODO: This Makefile has CircleCI assumptions run: | - cp ${{env.ACTION_PATH}}/../../.circle/Makefile . + cp ${ACTION_PATH}/../../.circle/Makefile . make requirements-ci .install-runners - name: Install pack requirements @@ -89,13 +89,13 @@ runs: PACK_REQUIREMENTS_FILE: requirements.txt PACK_TESTS_REQUIREMENTS_FILE: requirements-tests.txt run: | - if [[ -f "${{env.PACK_REQUIREMENTS_FILE}}" ]]; then - echo "Installing pack requirements from ${{env.PACK_REQUIREMENTS_FILE}}" - ${{env.VIRTUALENV_DIR}}/bin/pip install -r "${{env.PACK_REQUIREMENTS_FILE}}" + if [[ -f "${PACK_REQUIREMENTS_FILE}" ]]; then + echo "Installing pack requirements from ${PACK_REQUIREMENTS_FILE}" + ${VIRTUALENV_DIR}/bin/pip install -r "${PACK_REQUIREMENTS_FILE}" fi - if [[ -f "${{env.PACK_TESTS_REQUIREMENTS_FILE}}" ]]; then - echo "Installing pack tests requirements from ${{env.PACK_TESTS_REQUIREMENTS_FILE}}" - ${{env.VIRTUALENV_DIR}}/bin/pip install -r "${{env.PACK_TESTS_REQUIREMENTS_FILE}}" + if [[ -f "${PACK_TESTS_REQUIREMENTS_FILE}" ]]; then + echo "Installing pack tests requirements from ${PACK_TESTS_REQUIREMENTS_FILE}" + ${VIRTUALENV_DIR}/bin/pip install -r "${PACK_TESTS_REQUIREMENTS_FILE}" fi - name: Print versions From 37d9a6e06e4d08f5849d74c7f1e9f5e48d335ac3 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 09:31:55 -0700 Subject: [PATCH 077/101] Update action.yaml --- gha/py-dependencies/action.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index 31889168..7d348940 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -76,8 +76,10 @@ runs: VIRTUALENV_DIR: "~/virtualenv" ACTION_PATH: ${{ github.action_path }} ST2_REPO_PATH: st2 + CI_DIR: ${{ format('{0}{1}', github.action_path, '/../..') }} # TODO: This Makefile has CircleCI assumptions run: | + echo CI_DIR = ${CI_DIR} cp ${ACTION_PATH}/../../.circle/Makefile . make requirements-ci .install-runners From f4b95cf6fcb6510fbc384d86d08b71e7a45a9bb1 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 09:42:19 -0700 Subject: [PATCH 078/101] Update action.yaml --- gha/py-dependencies/action.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index 7d348940..1839da53 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -59,6 +59,8 @@ runs: ./scripts/github/install-virtualenv.sh PIP_VERSION=$(grep '^PIP_VERSION' Makefile | awk '{print $3}') echo "::set-output name=pip-version::${PIP_VERSION}" + echo single VIRTUALENV_DIR=${VIRTUALENV_DIR} + echo double VIRTUALENV_DIR=${{env.VIRTUALENV_DIR}} ${VIRTUALENV_DIR}/bin/pip install -U "pip==${PIP_VERSION}" setuptools - name: Install StackStorm requirements From 71609b437c3631e33e1f076cfe17d59b5d7c2337 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 09:48:30 -0700 Subject: [PATCH 079/101] Update action.yaml --- gha/py-dependencies/action.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index 1839da53..bde28f6f 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -59,8 +59,10 @@ runs: ./scripts/github/install-virtualenv.sh PIP_VERSION=$(grep '^PIP_VERSION' Makefile | awk '{print $3}') echo "::set-output name=pip-version::${PIP_VERSION}" - echo single VIRTUALENV_DIR=${VIRTUALENV_DIR} - echo double VIRTUALENV_DIR=${{env.VIRTUALENV_DIR}} + echo single1 VIRTUALENV_DIR=${VIRTUALENV_DIR} + echo double1 VIRTUALENV_DIR=${{env.VIRTUALENV_DIR}} + echo single2 VIRTUALENV_DIR=${VIRTUALENV_DIR} + echo double2 VIRTUALENV_DIR=${{env.VIRTUALENV_DIR}} ${VIRTUALENV_DIR}/bin/pip install -U "pip==${PIP_VERSION}" setuptools - name: Install StackStorm requirements From 7f45ea9f392865bed3d8c020d72680707b3db615 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 10:01:02 -0700 Subject: [PATCH 080/101] Update action.yaml --- gha/py-dependencies/action.yaml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index bde28f6f..a8097bc4 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -59,11 +59,7 @@ runs: ./scripts/github/install-virtualenv.sh PIP_VERSION=$(grep '^PIP_VERSION' Makefile | awk '{print $3}') echo "::set-output name=pip-version::${PIP_VERSION}" - echo single1 VIRTUALENV_DIR=${VIRTUALENV_DIR} - echo double1 VIRTUALENV_DIR=${{env.VIRTUALENV_DIR}} - echo single2 VIRTUALENV_DIR=${VIRTUALENV_DIR} - echo double2 VIRTUALENV_DIR=${{env.VIRTUALENV_DIR}} - ${VIRTUALENV_DIR}/bin/pip install -U "pip==${PIP_VERSION}" setuptools + ${{env.VIRTUALENV_DIR}}/bin/pip install -U "pip==${PIP_VERSION}" setuptools - name: Install StackStorm requirements # this should run in the st2 checkout @@ -83,7 +79,10 @@ runs: CI_DIR: ${{ format('{0}{1}', github.action_path, '/../..') }} # TODO: This Makefile has CircleCI assumptions run: | - echo CI_DIR = ${CI_DIR} + echo CI_DIR1 = ${CI_DIR} + echo CI_DIR2 = ${{env.CI_DIR}} + echo ACTION_PATH1 = ${ACTION_PATH} + echo ACTION_PATH2 = ${{env.ACTION_PATH}} cp ${ACTION_PATH}/../../.circle/Makefile . make requirements-ci .install-runners @@ -97,11 +96,11 @@ runs: run: | if [[ -f "${PACK_REQUIREMENTS_FILE}" ]]; then echo "Installing pack requirements from ${PACK_REQUIREMENTS_FILE}" - ${VIRTUALENV_DIR}/bin/pip install -r "${PACK_REQUIREMENTS_FILE}" + ${{env.VIRTUALENV_DIR}}/bin/pip install -r "${PACK_REQUIREMENTS_FILE}" fi if [[ -f "${PACK_TESTS_REQUIREMENTS_FILE}" ]]; then echo "Installing pack tests requirements from ${PACK_TESTS_REQUIREMENTS_FILE}" - ${VIRTUALENV_DIR}/bin/pip install -r "${PACK_TESTS_REQUIREMENTS_FILE}" + ${{env.VIRTUALENV_DIR}}/bin/pip install -r "${PACK_TESTS_REQUIREMENTS_FILE}" fi - name: Print versions From f3ea37d2d364ea660ad8c64ed1d6d8c05b331d9c Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 10:04:43 -0700 Subject: [PATCH 081/101] Update action.yaml --- gha/py-dependencies/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index a8097bc4..c8955f3a 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -68,7 +68,7 @@ runs: env: VIRTUALENV_DIR: "~/virtualenv" run: | - ${VIRTUALENV_DIR}/bin/pip install -r requirements.txt + ${{env.VIRTUALENV_DIR}}/bin/pip install -r requirements.txt - name: Install runners shell: bash From fbb18fd912daabece2aaf92663359291d511e2f8 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 10:12:39 -0700 Subject: [PATCH 082/101] Update action.yaml --- gha/py-dependencies/action.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index c8955f3a..2b186391 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -79,11 +79,7 @@ runs: CI_DIR: ${{ format('{0}{1}', github.action_path, '/../..') }} # TODO: This Makefile has CircleCI assumptions run: | - echo CI_DIR1 = ${CI_DIR} - echo CI_DIR2 = ${{env.CI_DIR}} - echo ACTION_PATH1 = ${ACTION_PATH} - echo ACTION_PATH2 = ${{env.ACTION_PATH}} - cp ${ACTION_PATH}/../../.circle/Makefile . + cp ${{env.ACTION_PATH}}/../../.circle/Makefile . make requirements-ci .install-runners - name: Install pack requirements From 0006f69cb075b9c1cbdb7c2f05fab584c1d5750f Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 10:18:24 -0700 Subject: [PATCH 083/101] Update action.yaml --- gha/py-dependencies/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index 2b186391..0c3cf6d4 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -79,7 +79,7 @@ runs: CI_DIR: ${{ format('{0}{1}', github.action_path, '/../..') }} # TODO: This Makefile has CircleCI assumptions run: | - cp ${{env.ACTION_PATH}}/../../.circle/Makefile . + cp ${{env.ACTION_PATH}}/../../ci/.circle/Makefile . make requirements-ci .install-runners - name: Install pack requirements From acfdf9469c2fed40016c919627a4416b9a4adf04 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 10:21:31 -0700 Subject: [PATCH 084/101] Update action.yaml --- gha/py-dependencies/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/py-dependencies/action.yaml b/gha/py-dependencies/action.yaml index 0c3cf6d4..2b186391 100644 --- a/gha/py-dependencies/action.yaml +++ b/gha/py-dependencies/action.yaml @@ -79,7 +79,7 @@ runs: CI_DIR: ${{ format('{0}{1}', github.action_path, '/../..') }} # TODO: This Makefile has CircleCI assumptions run: | - cp ${{env.ACTION_PATH}}/../../ci/.circle/Makefile . + cp ${{env.ACTION_PATH}}/../../.circle/Makefile . make requirements-ci .install-runners - name: Install pack requirements From 663ae548ff608cafeb681ddb784ba24c6cfd3bb4 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 10:23:40 -0700 Subject: [PATCH 085/101] Update action.yaml --- gha/checkout/action.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gha/checkout/action.yaml b/gha/checkout/action.yaml index 8f0e065f..3587ab74 100644 --- a/gha/checkout/action.yaml +++ b/gha/checkout/action.yaml @@ -35,7 +35,7 @@ runs: uses: actions/checkout@v2 with: path: pack - depth: 1 + fetch-depth: 1 - name: Checkout st2 repo # so other scripts can reference StackStorm Python code @@ -44,7 +44,7 @@ runs: repository: StackStorm/st2 ref: ${{ inputs.st2_branch }} path: st2 - depth: 1 + fetch-depth: 1 - name: Checkout lint-configs repo uses: actions/checkout@v2 @@ -52,4 +52,4 @@ runs: repository: StackStorm/lint-configs ref: ${{ inputs.lint_configs_branch }} path: lint-configs - depth: 1 + fetch-depth: 1 From 780b3ec1eaa57814496b749ea294bbb21344a577 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 10:31:16 -0700 Subject: [PATCH 086/101] Update action.yaml --- gha/test/action.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gha/test/action.yaml b/gha/test/action.yaml index 2e00b4a6..e8043f83 100644 --- a/gha/test/action.yaml +++ b/gha/test/action.yaml @@ -31,7 +31,8 @@ runs: VIRTUALENV_DIR: "~/virtualenv" ACTION_PATH: ${{ github.action_path }} run: | - export PACK_NAME=$(${VIRTUALENV_DIR}/bin/python ${ACTION_PATH}/../../.circle/validate.py "${GITHUB_REPOSITORY##*/}" pack.yaml) + env + export PACK_NAME=$(${{env.VIRTUALENV_DIR}}/bin/python ${ACTION_PATH}/../../.circle/validate.py "${GITHUB_REPOSITORY##*/}" pack.yaml) if [[ -z "${PACK_NAME}" ]]; then echo "Unable to retrieve pack name." exit 1 From e89664569b802cd3e2dd8d85a836145638380071 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 10:38:25 -0700 Subject: [PATCH 087/101] Update action.yaml --- gha/test/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/test/action.yaml b/gha/test/action.yaml index e8043f83..abf723d4 100644 --- a/gha/test/action.yaml +++ b/gha/test/action.yaml @@ -39,7 +39,7 @@ runs: fi echo "::set-output name=pack-name::${PACK_NAME}" - - name: + - name: Unsure shell: bash env: VIRTUALENV_DIR: "~/virtualenv" From fbfa531eed5a342eaab4877391fe7b7231e3b835 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 10:43:51 -0700 Subject: [PATCH 088/101] Update action.yaml --- gha/test/action.yaml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gha/test/action.yaml b/gha/test/action.yaml index abf723d4..156897e3 100644 --- a/gha/test/action.yaml +++ b/gha/test/action.yaml @@ -24,6 +24,21 @@ runs: using: "composite" steps: +# - name: Get Pack Name (original) +# shell: bash +# id: pack-name +# env: +# VIRTUALENV_DIR: "~/virtualenv" +# ACTION_PATH: ${{ github.action_path }} +# run: | +# env +# export PACK_NAME=$(${{env.VIRTUALENV_DIR}}/bin/python ${ACTION_PATH}/../../.circle/validate.py "${GITHUB_REPOSITORY##*/}" pack.yaml) +# if [[ -z "${PACK_NAME}" ]]; then +# echo "Unable to retrieve pack name." +# exit 1 +# fi +# echo "::set-output name=pack-name::${PACK_NAME}" + - name: Get Pack Name shell: bash id: pack-name @@ -32,7 +47,7 @@ runs: ACTION_PATH: ${{ github.action_path }} run: | env - export PACK_NAME=$(${{env.VIRTUALENV_DIR}}/bin/python ${ACTION_PATH}/../../.circle/validate.py "${GITHUB_REPOSITORY##*/}" pack.yaml) + export PACK_NAME=$(${{env.VIRTUALENV_DIR}}/bin/python ${ACTION_PATH}/../../.circle/validate.py "logicmonitor-stackstorm-pack##*/" pack.yaml) if [[ -z "${PACK_NAME}" ]]; then echo "Unable to retrieve pack name." exit 1 From 87da3f76895eedda06c822f21691e4828dd63ad6 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 10:46:55 -0700 Subject: [PATCH 089/101] Update action.yaml --- gha/test/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/test/action.yaml b/gha/test/action.yaml index 156897e3..8b162ebb 100644 --- a/gha/test/action.yaml +++ b/gha/test/action.yaml @@ -47,7 +47,7 @@ runs: ACTION_PATH: ${{ github.action_path }} run: | env - export PACK_NAME=$(${{env.VIRTUALENV_DIR}}/bin/python ${ACTION_PATH}/../../.circle/validate.py "logicmonitor-stackstorm-pack##*/" pack.yaml) + export PACK_NAME=$(${{env.VIRTUALENV_DIR}}/bin/python ${ACTION_PATH}/../../.circle/validate.py "logicmonitor-stackstorm-pack" pack.yaml) if [[ -z "${PACK_NAME}" ]]; then echo "Unable to retrieve pack name." exit 1 From f8f7017acf07fd86338c240d0c359bb0efad48ca Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 10:57:56 -0700 Subject: [PATCH 090/101] Update action.yaml --- gha/test/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/test/action.yaml b/gha/test/action.yaml index 8b162ebb..27589d9c 100644 --- a/gha/test/action.yaml +++ b/gha/test/action.yaml @@ -47,7 +47,7 @@ runs: ACTION_PATH: ${{ github.action_path }} run: | env - export PACK_NAME=$(${{env.VIRTUALENV_DIR}}/bin/python ${ACTION_PATH}/../../.circle/validate.py "logicmonitor-stackstorm-pack" pack.yaml) + export PACK_NAME=$(${{env.VIRTUALENV_DIR}}/bin/python ${ACTION_PATH}/../../.circle/validate.py "lm-ydubler/logicmonitor-stackstorm-pack" pack.yaml) if [[ -z "${PACK_NAME}" ]]; then echo "Unable to retrieve pack name." exit 1 From d83a6d353b749a7b3917f6de6c8982bb9425b9e1 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 11:01:18 -0700 Subject: [PATCH 091/101] Update action.yaml --- gha/test/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/test/action.yaml b/gha/test/action.yaml index 27589d9c..aee54dd9 100644 --- a/gha/test/action.yaml +++ b/gha/test/action.yaml @@ -47,7 +47,7 @@ runs: ACTION_PATH: ${{ github.action_path }} run: | env - export PACK_NAME=$(${{env.VIRTUALENV_DIR}}/bin/python ${ACTION_PATH}/../../.circle/validate.py "lm-ydubler/logicmonitor-stackstorm-pack" pack.yaml) + export PACK_NAME=$(${{env.VIRTUALENV_DIR}}/bin/python ${ACTION_PATH}/../../.circle/validate.py "lm-ydubler/logicmonitor-stackstorm-pack" "./pack.yaml") if [[ -z "${PACK_NAME}" ]]; then echo "Unable to retrieve pack name." exit 1 From 1284a74a5d64bf7c601497f72bd69510ff372678 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 11:19:50 -0700 Subject: [PATCH 092/101] Update action.yaml --- gha/test/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/test/action.yaml b/gha/test/action.yaml index aee54dd9..f2a391ff 100644 --- a/gha/test/action.yaml +++ b/gha/test/action.yaml @@ -47,7 +47,7 @@ runs: ACTION_PATH: ${{ github.action_path }} run: | env - export PACK_NAME=$(${{env.VIRTUALENV_DIR}}/bin/python ${ACTION_PATH}/../../.circle/validate.py "lm-ydubler/logicmonitor-stackstorm-pack" "./pack.yaml") + export PACK_NAME=$(${{env.VIRTUALENV_DIR}}/bin/python ${ACTION_PATH}/../../.circle/validate.py "lm-ydubler/logicmonitor-stackstorm-pack##*/" "./pack.yaml") if [[ -z "${PACK_NAME}" ]]; then echo "Unable to retrieve pack name." exit 1 From b5d8087b30da2b9a7c6a9b563363550768f72fcf Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 11:48:52 -0700 Subject: [PATCH 093/101] Update action.yaml --- gha/test/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/test/action.yaml b/gha/test/action.yaml index f2a391ff..4fecb8d3 100644 --- a/gha/test/action.yaml +++ b/gha/test/action.yaml @@ -47,7 +47,7 @@ runs: ACTION_PATH: ${{ github.action_path }} run: | env - export PACK_NAME=$(${{env.VIRTUALENV_DIR}}/bin/python ${ACTION_PATH}/../../.circle/validate.py "lm-ydubler/logicmonitor-stackstorm-pack##*/" "./pack.yaml") + export PACK_NAME=$(${{env.VIRTUALENV_DIR}}/bin/python ${ACTION_PATH}/../../.circle/validate.py "lm-ydubler/logicmonitor-stackstorm-pack" "pack.yaml") if [[ -z "${PACK_NAME}" ]]; then echo "Unable to retrieve pack name." exit 1 From 74d7b7d093ec10b34e836eef758d06fba73ed953 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 11:52:40 -0700 Subject: [PATCH 094/101] Update action.yaml --- gha/test/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/test/action.yaml b/gha/test/action.yaml index 4fecb8d3..dd494c0e 100644 --- a/gha/test/action.yaml +++ b/gha/test/action.yaml @@ -47,7 +47,7 @@ runs: ACTION_PATH: ${{ github.action_path }} run: | env - export PACK_NAME=$(${{env.VIRTUALENV_DIR}}/bin/python ${ACTION_PATH}/../../.circle/validate.py "lm-ydubler/logicmonitor-stackstorm-pack" "pack.yaml") + export PACK_NAME=$(${{env.VIRTUALENV_DIR}}/bin/python ${ACTION_PATH}/../../.circle/validate.py "lm-ydubler/logicmonitor-stackstorm-pack" "/home/runner/work/_actions/lm-ydubler/logicmonitor-stackstorm-pack/pack.yaml") if [[ -z "${PACK_NAME}" ]]; then echo "Unable to retrieve pack name." exit 1 From 4f4dc42e85871bf470f19b696ed727d568b44d07 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 11:52:53 -0700 Subject: [PATCH 095/101] Update action.yaml --- gha/test/action.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/gha/test/action.yaml b/gha/test/action.yaml index dd494c0e..afb94126 100644 --- a/gha/test/action.yaml +++ b/gha/test/action.yaml @@ -46,7 +46,6 @@ runs: VIRTUALENV_DIR: "~/virtualenv" ACTION_PATH: ${{ github.action_path }} run: | - env export PACK_NAME=$(${{env.VIRTUALENV_DIR}}/bin/python ${ACTION_PATH}/../../.circle/validate.py "lm-ydubler/logicmonitor-stackstorm-pack" "/home/runner/work/_actions/lm-ydubler/logicmonitor-stackstorm-pack/pack.yaml") if [[ -z "${PACK_NAME}" ]]; then echo "Unable to retrieve pack name." From b340e070cacc7923d9140d4e0970e4bcbc58fbc7 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 11:59:31 -0700 Subject: [PATCH 096/101] Update action.yaml --- gha/test/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/test/action.yaml b/gha/test/action.yaml index afb94126..23392426 100644 --- a/gha/test/action.yaml +++ b/gha/test/action.yaml @@ -46,7 +46,7 @@ runs: VIRTUALENV_DIR: "~/virtualenv" ACTION_PATH: ${{ github.action_path }} run: | - export PACK_NAME=$(${{env.VIRTUALENV_DIR}}/bin/python ${ACTION_PATH}/../../.circle/validate.py "lm-ydubler/logicmonitor-stackstorm-pack" "/home/runner/work/_actions/lm-ydubler/logicmonitor-stackstorm-pack/pack.yaml") + export PACK_NAME=$(${{env.VIRTUALENV_DIR}}/bin/python ${ACTION_PATH}/../../.circle/validate.py "lm-ydubler/logicmonitor-stackstorm-pack" "/home/runner/work/_actions/lm-ydubler/logicmonitor-stackstorm-pack/main/pack.yaml") if [[ -z "${PACK_NAME}" ]]; then echo "Unable to retrieve pack name." exit 1 From 23ed462762f98c0314ff7766bc16fc8e930b8b67 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 12:02:16 -0700 Subject: [PATCH 097/101] Update action.yaml --- gha/test/action.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gha/test/action.yaml b/gha/test/action.yaml index 23392426..83e20405 100644 --- a/gha/test/action.yaml +++ b/gha/test/action.yaml @@ -46,6 +46,14 @@ runs: VIRTUALENV_DIR: "~/virtualenv" ACTION_PATH: ${{ github.action_path }} run: | + cd /home/runner/work/_actions/lm-ydubler/ + ls + cd /home/runner/work/_actions/lm-ydubler/logicmonitor-stackstorm-pack/main/ + ls + cd /home/runner/work/_actions/lm-ydubler/logicmonitor-stackstorm-pack/ + ls + cd /home/runner/work/_actions/lm-ydubler/logicmonitor-stackstorm-pack/main/ + ls export PACK_NAME=$(${{env.VIRTUALENV_DIR}}/bin/python ${ACTION_PATH}/../../.circle/validate.py "lm-ydubler/logicmonitor-stackstorm-pack" "/home/runner/work/_actions/lm-ydubler/logicmonitor-stackstorm-pack/main/pack.yaml") if [[ -z "${PACK_NAME}" ]]; then echo "Unable to retrieve pack name." From 77cd22d86f9f5c0818debc2587391a6d4fe39cdd Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 12:08:26 -0700 Subject: [PATCH 098/101] Update action.yaml --- gha/test/action.yaml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gha/test/action.yaml b/gha/test/action.yaml index 83e20405..963f0ed1 100644 --- a/gha/test/action.yaml +++ b/gha/test/action.yaml @@ -46,14 +46,13 @@ runs: VIRTUALENV_DIR: "~/virtualenv" ACTION_PATH: ${{ github.action_path }} run: | - cd /home/runner/work/_actions/lm-ydubler/ - ls - cd /home/runner/work/_actions/lm-ydubler/logicmonitor-stackstorm-pack/main/ - ls - cd /home/runner/work/_actions/lm-ydubler/logicmonitor-stackstorm-pack/ - ls - cd /home/runner/work/_actions/lm-ydubler/logicmonitor-stackstorm-pack/main/ - ls + echo -e '\n\n /home/runner/work/_actions/lm-ydubler/ \n\n' + ls /home/runner/work/_actions/lm-ydubler/ + echo -e '\n\n /home/runner/work/_actions/lm-ydubler/logicmonitor-stackstorm-pack \n\n' + ls /home/runner/work/_actions/lm-ydubler/logicmonitor-stackstorm-pack/ + echo -e '\n\n /home/runner/work/_actions/lm-ydubler/logicmonitor-stackstorm-pack/main/ \n\n' + ls /home/runner/work/_actions/lm-ydubler/logicmonitor-stackstorm-pack/main/ + echo -e '\n\n' export PACK_NAME=$(${{env.VIRTUALENV_DIR}}/bin/python ${ACTION_PATH}/../../.circle/validate.py "lm-ydubler/logicmonitor-stackstorm-pack" "/home/runner/work/_actions/lm-ydubler/logicmonitor-stackstorm-pack/main/pack.yaml") if [[ -z "${PACK_NAME}" ]]; then echo "Unable to retrieve pack name." From bc32459abbe34ae1554bea576f4abbe9512322e6 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 12:11:57 -0700 Subject: [PATCH 099/101] Update action.yaml --- gha/test/action.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gha/test/action.yaml b/gha/test/action.yaml index 963f0ed1..8ab8d203 100644 --- a/gha/test/action.yaml +++ b/gha/test/action.yaml @@ -46,14 +46,14 @@ runs: VIRTUALENV_DIR: "~/virtualenv" ACTION_PATH: ${{ github.action_path }} run: | - echo -e '\n\n /home/runner/work/_actions/lm-ydubler/ \n\n' - ls /home/runner/work/_actions/lm-ydubler/ - echo -e '\n\n /home/runner/work/_actions/lm-ydubler/logicmonitor-stackstorm-pack \n\n' - ls /home/runner/work/_actions/lm-ydubler/logicmonitor-stackstorm-pack/ - echo -e '\n\n /home/runner/work/_actions/lm-ydubler/logicmonitor-stackstorm-pack/main/ \n\n' - ls /home/runner/work/_actions/lm-ydubler/logicmonitor-stackstorm-pack/main/ + echo -e '\n\n/home/runner/work/logicmonitor-stackstorm-pack/ \n\n' + ls /home/runner/work/logicmonitor-stackstorm-pack/ + echo -e '\n\n/home/runner/work/_actions/lm-ydubler/logicmonitor-stackstorm-pack \n\n' + ls /home/runner/work/logicmonitor-stackstorm-pack/logicmonitor-stackstorm-pack/ + echo -e '\n\n/home/runner/work/logicmonitor-stackstorm-pack/logicmonitor-stackstorm-pack/pack/ \n\n' + ls /home/runner/work/logicmonitor-stackstorm-pack/logicmonitor-stackstorm-pack/pack/ echo -e '\n\n' - export PACK_NAME=$(${{env.VIRTUALENV_DIR}}/bin/python ${ACTION_PATH}/../../.circle/validate.py "lm-ydubler/logicmonitor-stackstorm-pack" "/home/runner/work/_actions/lm-ydubler/logicmonitor-stackstorm-pack/main/pack.yaml") + export PACK_NAME=$(${{env.VIRTUALENV_DIR}}/bin/python ${ACTION_PATH}/../../.circle/validate.py "lm-ydubler/logicmonitor-stackstorm-pack" "/home/runner/work/logicmonitor-stackstorm-pack/logicmonitor-stackstorm-pack/pack/pack.yaml") if [[ -z "${PACK_NAME}" ]]; then echo "Unable to retrieve pack name." exit 1 From f3962e6e166f9c14793967773af0d9ee5f3f3cca Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 12:18:02 -0700 Subject: [PATCH 100/101] Update action.yaml --- gha/test/action.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gha/test/action.yaml b/gha/test/action.yaml index 8ab8d203..a66f6422 100644 --- a/gha/test/action.yaml +++ b/gha/test/action.yaml @@ -48,7 +48,7 @@ runs: run: | echo -e '\n\n/home/runner/work/logicmonitor-stackstorm-pack/ \n\n' ls /home/runner/work/logicmonitor-stackstorm-pack/ - echo -e '\n\n/home/runner/work/_actions/lm-ydubler/logicmonitor-stackstorm-pack \n\n' + echo -e '\n\n/home/runner/work/lm-ydubler/logicmonitor-stackstorm-pack \n\n' ls /home/runner/work/logicmonitor-stackstorm-pack/logicmonitor-stackstorm-pack/ echo -e '\n\n/home/runner/work/logicmonitor-stackstorm-pack/logicmonitor-stackstorm-pack/pack/ \n\n' ls /home/runner/work/logicmonitor-stackstorm-pack/logicmonitor-stackstorm-pack/pack/ @@ -65,7 +65,7 @@ runs: env: VIRTUALENV_DIR: "~/virtualenv" FORCE_CHECK_ALL_FILES: true if on default branch - ROOT_DIR: pack directory + ROOT_DIR: "/home/runner/work/logicmonitor-stackstorm-pack/logicmonitor-stackstorm-pack/pack/pack.yaml" CI_DIR: ${{ format('{0}{1}', github.action_path, '/../..') }} ST2_REPO_PATH: st2 directory ENABLE_COMMON_LIBS: ${{ inputs.enable-common-libs }} @@ -78,6 +78,6 @@ runs: export ST2_CONFIG_FILE=${CI_DIR}/conf/st2.tests.conf fi cp ${CI_DIR}/.circle/Makefile . - make -C "${ROOT_DIR}" all-ci + make -C "${{env.ROOT_DIR}}" all-ci From 43f48530522de8eaa5f76b7774f3b3770281e880 Mon Sep 17 00:00:00 2001 From: lm-ydubler <92544319+lm-ydubler@users.noreply.github.com> Date: Tue, 23 Nov 2021 12:18:37 -0700 Subject: [PATCH 101/101] Update action.yaml --- gha/test/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gha/test/action.yaml b/gha/test/action.yaml index a66f6422..c58322ac 100644 --- a/gha/test/action.yaml +++ b/gha/test/action.yaml @@ -65,7 +65,7 @@ runs: env: VIRTUALENV_DIR: "~/virtualenv" FORCE_CHECK_ALL_FILES: true if on default branch - ROOT_DIR: "/home/runner/work/logicmonitor-stackstorm-pack/logicmonitor-stackstorm-pack/pack/pack.yaml" + ROOT_DIR: "/home/runner/work/logicmonitor-stackstorm-pack/logicmonitor-stackstorm-pack/" CI_DIR: ${{ format('{0}{1}', github.action_path, '/../..') }} ST2_REPO_PATH: st2 directory ENABLE_COMMON_LIBS: ${{ inputs.enable-common-libs }}