Skip to content

Commit da66f25

Browse files
gizmoguygizmoguy
authored
Merge pull request #3703 from gizmoguy/gha-set-env
Move to environment files instead of set-env.
2 parents a3e0371 + c8888e5 commit da66f25

File tree

3 files changed

+29
-22
lines changed

3 files changed

+29
-22
lines changed

‎.github/workflows/tests-codecheck.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ jobs:
2727
- if: ${{ steps.file_changes.outputs.all }}
2828
name: Compare file changes
2929
run: |
30-
sudo apt-get install jq
3130
FILES_ALL="$(echo '${{ steps.file_changes.outputs.all }}' | jq -r '.[]' | tr '\n' ' ')"
3231
FILES_ADDED="$(echo '${{ steps.file_changes.outputs.added }}' | jq -r '.[]' | tr '\n' ' ')"
3332
FILES_DELETED="$(echo '${{ steps.file_changes.outputs.deleted }}' | jq -r '.[]' | tr '\n' ' ')"
@@ -38,15 +37,17 @@ jobs:
3837
CI_TEST_FILES_CHANGED="$(echo ${FILES_ADDED_MODIFIED} | tr ' ' '\n' | grep -E '(workflows\/tests-.+\.yml$|Dockerfile\.tests$|^docker\/.+$|tests\/.+\.sh$)' | tr '\n' ' ')"
3938
RQ_FILES_CHANGED="$(echo ${FILES_ADDED_MODIFIED} | tr ' ' '\n' | grep -E 'requirements(.*)txt$' | tr '\n' ' ')"
4039
DOC_FILES_CHANGED="$(echo ${FILES_ADDED_MODIFIED} | tr ' ' '\n' | grep -E '^docs/.+$' | tr '\n' ' ')"
41-
echo "Files changed: ${FILES_ADDED_MODIFIED}"
40+
if [ ! -z "${CI_TEST_FILES_CHANGED}" ]; then FILES_CHANGED="all"; else FILES_CHANGED="${FILES_ADDED_MODIFIED}"; fi
41+
echo "Git added/modified: ${FILES_ADDED_MODIFIED}"
4242
echo "CI test files changed: ${CI_TEST_FILES_CHANGED}"
4343
echo "Python code changed: ${PY_FILES_CHANGED}"
4444
echo "Requirement changes: ${RQ_FILES_CHANGED}"
4545
echo "Documentation changes: ${DOC_FILES_CHANGED}"
46-
if [ ! -z "${CI_TEST_FILES_CHANGED}" ]; then echo ::set-env name=FILES_CHANGED::all; else echo ::set-env name=FILES_CHANGED::${FILES_ADDED_MODIFIED}; fi
47-
echo ::set-env name=PY_FILES_CHANGED::${PY_FILES_CHANGED}
48-
echo ::set-env name=RQ_FILES_CHANGED::${RQ_FILES_CHANGED}
49-
echo ::set-env name=DOC_FILES_CHANGED::${DOC_FILES_CHANGED}
46+
echo "Files changed: ${FILES_CHANGED}"
47+
echo "FILES_CHANGED=${FILES_CHANGED}" >> ${GITHUB_ENV}
48+
echo "PY_FILES_CHANGED=${PY_FILES_CHANGED}" >> ${GITHUB_ENV}
49+
echo "RQ_FILES_CHANGED=${RQ_FILES_CHANGED}" >> ${GITHUB_ENV}
50+
echo "DOC_FILES_CHANGED=${DOC_FILES_CHANGED}" >> ${GITHUB_ENV}
5051
- name: Set up python-${{ env.CODECHECK_PY_VER }}
5152
uses: actions/setup-python@v2
5253
with:

‎.github/workflows/tests-integration.yml‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,17 @@ jobs:
4040
CI_TEST_FILES_CHANGED="$(echo ${FILES_ADDED_MODIFIED} | tr ' ' '\n' | grep -E '(workflows\/tests-.+\.yml$|Dockerfile\.tests$|^docker\/.+$|tests\/.+\.sh$)' | tr '\n' ' ')"
4141
RQ_FILES_CHANGED="$(echo ${FILES_ADDED_MODIFIED} | tr ' ' '\n' | grep -E 'requirements(.*)txt$' | tr '\n' ' ')"
4242
DOC_FILES_CHANGED="$(echo ${FILES_ADDED_MODIFIED} | tr ' ' '\n' | grep -E '^docs/.+$' | tr '\n' ' ')"
43-
echo "Files changed: ${FILES_ADDED_MODIFIED}"
43+
if [ ! -z "${CI_TEST_FILES_CHANGED}" ]; then FILES_CHANGED="all"; else FILES_CHANGED="${FILES_ADDED_MODIFIED}"; fi
44+
echo "Git added/modified: ${FILES_ADDED_MODIFIED}"
4445
echo "CI test files changed: ${CI_TEST_FILES_CHANGED}"
4546
echo "Python code changed: ${PY_FILES_CHANGED}"
4647
echo "Requirement changes: ${RQ_FILES_CHANGED}"
4748
echo "Documentation changes: ${DOC_FILES_CHANGED}"
48-
if [ ! -z "${CI_TEST_FILES_CHANGED}" ]; then echo ::set-env name=FILES_CHANGED::all; else echo ::set-env name=FILES_CHANGED::${FILES_ADDED_MODIFIED}; fi
49-
echo ::set-env name=PY_FILES_CHANGED::${PY_FILES_CHANGED}
50-
echo ::set-env name=RQ_FILES_CHANGED::${RQ_FILES_CHANGED}
51-
echo ::set-env name=DOC_FILES_CHANGED::${DOC_FILES_CHANGED}
49+
echo "Files changed: ${FILES_CHANGED}"
50+
echo "FILES_CHANGED=${FILES_CHANGED}" >> ${GITHUB_ENV}
51+
echo "PY_FILES_CHANGED=${PY_FILES_CHANGED}" >> ${GITHUB_ENV}
52+
echo "RQ_FILES_CHANGED=${RQ_FILES_CHANGED}" >> ${GITHUB_ENV}
53+
echo "DOC_FILES_CHANGED=${DOC_FILES_CHANGED}" >> ${GITHUB_ENV}
5254
- if: ${{ env.FILES_CHANGED == 'all' || env.PY_FILES_CHANGED || env.RQ_FILES_CHANGED }}
5355
name: Initialise environment
5456
run: |
@@ -107,15 +109,17 @@ jobs:
107109
CI_TEST_FILES_CHANGED="$(echo ${FILES_ADDED_MODIFIED} | tr ' ' '\n' | grep -E '(workflows\/tests-.+\.yml$|Dockerfile\.tests$|^docker\/.+$|tests\/.+\.sh$)' | tr '\n' ' ')"
108110
RQ_FILES_CHANGED="$(echo ${FILES_ADDED_MODIFIED} | tr ' ' '\n' | grep -E 'requirements(.*)txt$' | tr '\n' ' ')"
109111
DOC_FILES_CHANGED="$(echo ${FILES_ADDED_MODIFIED} | tr ' ' '\n' | grep -E '^docs/.+$' | tr '\n' ' ')"
110-
echo "Files changed: ${FILES_ADDED_MODIFIED}"
112+
if [ ! -z "${CI_TEST_FILES_CHANGED}" ]; then FILES_CHANGED="all"; else FILES_CHANGED="${FILES_ADDED_MODIFIED}"; fi
113+
echo "Git added/modified: ${FILES_ADDED_MODIFIED}"
111114
echo "CI test files changed: ${CI_TEST_FILES_CHANGED}"
112115
echo "Python code changed: ${PY_FILES_CHANGED}"
113116
echo "Requirement changes: ${RQ_FILES_CHANGED}"
114117
echo "Documentation changes: ${DOC_FILES_CHANGED}"
115-
if [ ! -z "${CI_TEST_FILES_CHANGED}" ]; then echo ::set-env name=FILES_CHANGED::all; else echo ::set-env name=FILES_CHANGED::${FILES_ADDED_MODIFIED}; fi
116-
echo ::set-env name=PY_FILES_CHANGED::${PY_FILES_CHANGED}
117-
echo ::set-env name=RQ_FILES_CHANGED::${RQ_FILES_CHANGED}
118-
echo ::set-env name=DOC_FILES_CHANGED::${DOC_FILES_CHANGED}
118+
echo "Files changed: ${FILES_CHANGED}"
119+
echo "FILES_CHANGED=${FILES_CHANGED}" >> ${GITHUB_ENV}
120+
echo "PY_FILES_CHANGED=${PY_FILES_CHANGED}" >> ${GITHUB_ENV}
121+
echo "RQ_FILES_CHANGED=${RQ_FILES_CHANGED}" >> ${GITHUB_ENV}
122+
echo "DOC_FILES_CHANGED=${DOC_FILES_CHANGED}" >> ${GITHUB_ENV}
119123
- if: ${{ env.FILES_CHANGED == 'all' || env.PY_FILES_CHANGED || env.RQ_FILES_CHANGED }}
120124
name: Initialise environment
121125
run: |
@@ -130,7 +134,7 @@ jobs:
130134
shard_tests=$(./docker/shard_tests.sh "${{ env.MATRIX_SHARDS }}" "${{ matrix.MATRIX_SHARD }}")
131135
faucet_tests="-din ${shard_tests}"
132136
echo "Running the following faucet tests on this shard: ${shard_tests}"
133-
echo ::set-env name=FAUCET_TESTS::${faucet_tests}
137+
echo "FAUCET_TESTS=${faucet_tests}" >> ${GITHUB_ENV}
134138
- if: ${{ env.FILES_CHANGED == 'all' || env.PY_FILES_CHANGED || env.RQ_FILES_CHANGED }}
135139
name: Run integration tests
136140
run: |

‎.github/workflows/tests-unit.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,17 @@ jobs:
3939
CI_TEST_FILES_CHANGED="$(echo ${FILES_ADDED_MODIFIED} | tr ' ' '\n' | grep -E '(workflows\/tests-.+\.yml$|Dockerfile\.tests$|^docker\/.+$|tests\/.+\.sh$)' | tr '\n' ' ')"
4040
RQ_FILES_CHANGED="$(echo ${FILES_ADDED_MODIFIED} | tr ' ' '\n' | grep -E 'requirements(.*)txt$' | tr '\n' ' ')"
4141
DOC_FILES_CHANGED="$(echo ${FILES_ADDED_MODIFIED} | tr ' ' '\n' | grep -E '^docs/.+$' | tr '\n' ' ')"
42-
echo "Files changed: ${FILES_ADDED_MODIFIED}"
42+
if [ ! -z "${CI_TEST_FILES_CHANGED}" ]; then FILES_CHANGED="all"; else FILES_CHANGED="${FILES_ADDED_MODIFIED}"; fi
43+
echo "Git added/modified: ${FILES_ADDED_MODIFIED}"
4344
echo "CI test files changed: ${CI_TEST_FILES_CHANGED}"
4445
echo "Python code changed: ${PY_FILES_CHANGED}"
4546
echo "Requirement changes: ${RQ_FILES_CHANGED}"
4647
echo "Documentation changes: ${DOC_FILES_CHANGED}"
47-
if [ ! -z "${CI_TEST_FILES_CHANGED}" ]; then echo ::set-env name=FILES_CHANGED::all; else echo ::set-env name=FILES_CHANGED::${FILES_ADDED_MODIFIED}; fi
48-
echo ::set-env name=PY_FILES_CHANGED::${PY_FILES_CHANGED}
49-
echo ::set-env name=RQ_FILES_CHANGED::${RQ_FILES_CHANGED}
50-
echo ::set-env name=DOC_FILES_CHANGED::${DOC_FILES_CHANGED}
48+
echo "Files changed: ${FILES_CHANGED}"
49+
echo "FILES_CHANGED=${FILES_CHANGED}" >> ${GITHUB_ENV}
50+
echo "PY_FILES_CHANGED=${PY_FILES_CHANGED}" >> ${GITHUB_ENV}
51+
echo "RQ_FILES_CHANGED=${RQ_FILES_CHANGED}" >> ${GITHUB_ENV}
52+
echo "DOC_FILES_CHANGED=${DOC_FILES_CHANGED}" >> ${GITHUB_ENV}
5153
- name: Set up python-${{ matrix.python-version }}
5254
uses: actions/setup-python@v2
5355
with:

0 commit comments

Comments
 (0)