Skip to content

Commit dba24e6

Browse files
craig8craig8
authored
Merge pull request #2772 from bonicim/fix-wflows
Change output_suffix in build-action step
2 parents bb15dfa + 4024ed4 commit dba24e6

File tree

6 files changed

+31
-25
lines changed

6 files changed

+31
-25
lines changed

‎.github/workflows/pytest-dbutils-backup_db.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ jobs:
5454
with:
5555
python-version: ${{ matrix.python-version }}
5656

57+
- name: Create output suffix
58+
run: |
59+
echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
60+
5761
# Run the specified tests and save the results to a unique file that can be archived for later analysis.
5862
- name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
5963
uses: volttron/volttron-build-action@v1
@@ -62,12 +66,9 @@ jobs:
6266
python_version: ${{ matrix.python-version }}
6367
os: ${{ matrix.os }}
6468
test_path: ${{ env.TEST_FILE }}
65-
test_output_suffix: ${{ env.TEST_FILE }}
69+
test_output_suffix: ${{ env.OUTPUT_SUFFIX }}
6670

6771
# Archive the results from the pytest to storage.
68-
- name: Create output suffix
69-
run: |
70-
echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
7172
- name: Archive test results
7273
uses: actions/upload-artifact@v2
7374
if: always()

‎.github/workflows/pytest-dbutils-influxdbfuncts.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ jobs:
4444
with:
4545
python-version: ${{ matrix.python-version }}
4646

47+
- name: Create output suffix
48+
run: |
49+
echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
50+
4751
# Run the specified tests and save the results to a unique file that can be archived for later analysis.
4852
- name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
4953
uses: volttron/volttron-build-action@v1
@@ -52,12 +56,9 @@ jobs:
5256
python_version: ${{ matrix.python-version }}
5357
os: ${{ matrix.os }}
5458
test_path: ${{ env.TEST_FILE }}
55-
test_output_suffix: ${{ env.TEST_FILE }}
59+
test_output_suffix: ${{ env.OUTPUT_SUFFIX }}
5660

5761
# Archive the results from the pytest to storage.
58-
- name: Create output suffix
59-
run: |
60-
echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
6162
- name: Archive test results
6263
uses: actions/upload-artifact@v2
6364
if: always()

‎.github/workflows/pytest-dbutils-mysqlfuncts.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ jobs:
4444
with:
4545
python-version: ${{ matrix.python-version }}
4646

47+
- name: Create output suffix
48+
run: |
49+
echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
50+
4751
# Run the specified tests and save the results to a unique file that can be archived for later analysis.
4852
- name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
4953
uses: volttron/volttron-build-action@v1
@@ -52,12 +56,9 @@ jobs:
5256
python_version: ${{ matrix.python-version }}
5357
os: ${{ matrix.os }}
5458
test_path: ${{ env.TEST_FILE }}
55-
test_output_suffix: ${{ env.TEST_FILE }}
59+
test_output_suffix: ${{ env.OUTPUT_SUFFIX }}
5660

5761
# Archive the results from the pytest to storage.
58-
- name: Create output suffix
59-
run: |
60-
echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
6162
- name: Archive test results
6263
uses: actions/upload-artifact@v2
6364
if: always()

‎.github/workflows/pytest-dbutils-postgresqlfuncts.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ jobs:
4444
with:
4545
python-version: ${{ matrix.python-version }}
4646

47+
- name: Create output suffix
48+
run: |
49+
echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
50+
4751
# Run the specified tests and save the results to a unique file that can be archived for later analysis.
4852
- name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
4953
uses: volttron/volttron-build-action@v1
@@ -52,12 +56,9 @@ jobs:
5256
python_version: ${{ matrix.python-version }}
5357
os: ${{ matrix.os }}
5458
test_path: ${{ env.TEST_FILE }}
55-
test_output_suffix: ${{ env.TEST_FILE }}
59+
test_output_suffix: ${{ env.OUTPUT_SUFFIX }}
5660

5761
# Archive the results from the pytest to storage.
58-
- name: Create output suffix
59-
run: |
60-
echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
6162
- name: Archive test results
6263
uses: actions/upload-artifact@v2
6364
if: always()

‎.github/workflows/pytest-dbutils-sqlitefuncts.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ jobs:
4444
with:
4545
python-version: ${{ matrix.python-version }}
4646

47+
# Archive the results from the pytest to storage.
48+
- name: Create output suffix
49+
run: |
50+
echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
51+
4752
# Run the specified tests and save the results to a unique file that can be archived for later analysis.
4853
- name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
4954
uses: volttron/volttron-build-action@v1
@@ -52,12 +57,8 @@ jobs:
5257
python_version: ${{ matrix.python-version }}
5358
os: ${{ matrix.os }}
5459
test_path: ${{ env.TEST_FILE }}
55-
test_output_suffix: ${{ env.TEST_FILE }}
60+
test_output_suffix: ${{ env.OUTPUT_SUFFIX }}
5661

57-
# Archive the results from the pytest to storage.
58-
- name: Create output suffix
59-
run: |
60-
echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
6162
- name: Archive test results
6263
uses: actions/upload-artifact@v2
6364
if: always()

‎.github/workflows/pytest-dbutils-timescaldbfuncts.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ jobs:
4444
with:
4545
python-version: ${{ matrix.python-version }}
4646

47+
- name: Create output suffix
48+
run: |
49+
echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
50+
4751
# Run the specified tests and save the results to a unique file that can be archived for later analysis.
4852
- name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
4953
uses: volttron/volttron-build-action@v1
@@ -52,12 +56,9 @@ jobs:
5256
python_version: ${{ matrix.python-version }}
5357
os: ${{ matrix.os }}
5458
test_path: ${{ env.TEST_FILE }}
55-
test_output_suffix: ${{ env.TEST_FILE }}
59+
test_output_suffix: ${{ env.OUTPUT_SUFFIX }}
5660

5761
# Archive the results from the pytest to storage.
58-
- name: Create output suffix
59-
run: |
60-
echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
6162
- name: Archive test results
6263
uses: actions/upload-artifact@v2
6364
if: always()

0 commit comments

Comments
 (0)