Updates to ci/gha #117
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,27 +24,51 @@ 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 | ||
| env: | ||
| VIRTUALENV_DIR: "~/virtualenv" | ||
| ACTION_PATH: ${{ github.action_path }} | ||
| 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/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/logicmonitor-stackstorm-pack/logicmonitor-stackstorm-pack/pack/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: Unsure | ||
| shell: bash | ||
| env: | ||
| VIRTUALENV_DIR: "~/virtualenv" | ||
| FORCE_CHECK_ALL_FILES: true if on default branch | ||
| ROOT_DIR: "/home/runner/work/logicmonitor-stackstorm-pack/logicmonitor-stackstorm-pack/" | ||
| CI_DIR: ${{ format('{0}{1}', github.action_path, '/../..') }} | ||
|
There was a problem hiding this comment. Here is where CI_DIR is populated - I kind of guessed on the relative path though, so feel free to adjust this if it's not right. |
||
| ST2_REPO_PATH: st2 directory | ||
| ENABLE_COMMON_LIBS: ${{ inputs.enable-common-libs }} | ||
| # TODO: This Makefile has CircleCI assumptions | ||
| run: | | ||
| if [[ "true" == "${ENABLE_COMMON_LIBS}" ]]; then | ||
|
|
@@ -54,6 +78,6 @@ runs: | |
| export ST2_CONFIG_FILE=${CI_DIR}/conf/st2.tests.conf | ||
| fi | ||
| cp ${CI_DIR}/.circle/Makefile . | ||
| make -C "${{env.ROOT_DIR}}" all-ci | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If CI_DIR is not populated correctly, that is concerning. Hmm.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It might have been populating correctly but possibly just had the wrong value. GHA doesn't allow string concatenation using a + so I improvised to use the format() function. So I'll look it over and make sure it all matches up knowing what the correct directory should be as a fail safe.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And just so you know, this is a testing PR and has a million commits a second. When it checks out , I'll create the final-draft PR which will have a handful of commits just so that it comes across clean.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. I expected that. But having it in a PR allows for some discussion about the issues you are working on 😄
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm going to consolidate some of your commits and add them to the gha branch of StackStorm-Exchange/ci.