1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 03:57:44 +00:00

ci: update default branch to "main" in workflows

This commit is contained in:
Jeffrey Finkelstein 2022-01-21 21:43:02 -05:00
parent 8c298e97a5
commit bfc0d81481
3 changed files with 11 additions and 11 deletions

View file

@ -5,14 +5,14 @@ name: FixPR
# ToDO: [2021-06; rivy] change from `cargo-tree` to `cargo tree` once MSRV is >= 1.45
env:
BRANCH_TARGET: master
BRANCH_TARGET: main
on:
# * only trigger on pull request closed to specific branches
# ref: https://github.community/t/trigger-workflow-only-on-pull-request-merge/17359/9
pull_request:
branches:
- master # == env.BRANCH_TARGET ## unfortunately, env context variables are only available in jobs/steps (see <https://github.community/t/how-to-use-env-context/16975/2>)
- main # == env.BRANCH_TARGET ## unfortunately, env context variables are only available in jobs/steps (see <https://github.community/t/how-to-use-env-context/16975/2>)
types: [ closed ]
jobs:

View file

@ -96,7 +96,7 @@ jobs:
workflow: GnuTests.yml
name: gnu-result
repo: uutils/coreutils
branch: master
branch: main
path: dl
- name: Download the log
uses: dawidd6/action-download-artifact@v2
@ -104,9 +104,9 @@ jobs:
workflow: GnuTests.yml
name: test-report
repo: uutils/coreutils
branch: master
branch: main
path: dl
- name: Compare failing tests against master
- name: Compare failing tests against main
shell: bash
run: |
OLD_FAILING=$(sed -n "s/^FAIL: \([[:print:]]\+\).*/\1/p" dl/test-suite.log | sort)
@ -121,11 +121,11 @@ jobs:
do
if ! grep -Fxq $LINE<<<"$OLD_FAILING"
then
echo "::error ::GNU test failed: $LINE. $LINE is passing on 'master'. Maybe you have to rebase?"
echo "::error ::GNU test failed: $LINE. $LINE is passing on 'main'. Maybe you have to rebase?"
fi
done
- name: Compare against master results
- name: Compare against main results
shell: bash
run: |
mv dl/gnu-result.json master-gnu-result.json
mv dl/gnu-result.json main-gnu-result.json
python uutils/util/compare_gnu_result.py