From 08d3915211ecf718679bd0d008d0a0e94a78b15f Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 22 Oct 2022 12:29:04 -0400 Subject: [PATCH] fix yamllint errors --- .github/ISSUE_TEMPLATE/bug-report.yml | 6 +- .github/ISSUE_TEMPLATE/config.yml | 1 + .github/workflows/CI.yml | 34 +++++----- .github/workflows/ci-docker.yml | 31 ++++----- .github/workflows/localize.yml | 91 +++++++++++++------------- .github/workflows/python-flake8.yml | 1 + .github/workflows/python-tests.yml | 11 ++-- .github/workflows/release-notifier.yml | 1 + .readthedocs.yaml | 1 + crowdin.yml | 7 +- 10 files changed, 98 insertions(+), 86 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index bd55b8c91..cbec1ede5 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -1,3 +1,4 @@ +--- name: Bug Report description: Create a bug report to help us improve. body: @@ -5,7 +6,7 @@ body: attributes: value: > **THIS IS NOT THE PLACE TO ASK FOR SUPPORT!** - Please use [Discord](https://retroarcher.github.io/discord) for support issues. + Please use our [Support Center](https://app.lizardbyte.dev/support) for support issues. - type: textarea id: description attributes: @@ -40,4 +41,5 @@ body: - type: markdown attributes: value: | - Make sure to close your issue when it's solved! If you found the solution yourself please comment so that others benefit from it. + Make sure to close your issue when it's solved! If you found the solution yourself please comment so that + others benefit from it. diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 286695394..ba507895e 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,3 +1,4 @@ +--- # This action is centrally managed in https://github.com//.github/ # Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in # the above-mentioned repo. diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 8926c8be6..b561fa214 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -1,3 +1,4 @@ +--- name: CI on: @@ -13,21 +14,22 @@ jobs: name: Check Changelog runs-on: ubuntu-latest steps: - - name: Checkout - if: ${{ github.ref == 'refs/heads/master' || github.base_ref == 'master' }} - uses: actions/checkout@v3 - - - name: Verify Changelog - id: verify_changelog - if: ${{ github.ref == 'refs/heads/master' || github.base_ref == 'master' }} - # base_ref for pull request check, ref for push - uses: LizardByte/.github/actions/verify_changelog@master - with: - token: ${{ secrets.GITHUB_TOKEN }} + - name: Checkout + if: ${{ github.ref == 'refs/heads/master' || github.base_ref == 'master' }} + uses: actions/checkout@v3 + + - name: Verify Changelog + id: verify_changelog + if: ${{ github.ref == 'refs/heads/master' || github.base_ref == 'master' }} + # base_ref for pull request check, ref for push + uses: LizardByte/.github/actions/verify_changelog@master + with: + token: ${{ secrets.GITHUB_TOKEN }} + outputs: next_version: ${{ steps.verify_changelog.outputs.changelog_parser_version }} last_version: ${{ steps.verify_changelog.outputs.latest_release_tag_name }} - release_body: ${{ steps.verify_changelog.outputs.changelog_parser_description }} + release_body: ${{ steps.verify_changelog.outputs.changelog_parser_description }} version_check: runs-on: ubuntu-latest @@ -58,7 +60,7 @@ jobs: echo "pyra_version=${OUTPUT}" >> $GITHUB_ENV - name: Compare versions - if: ( env.pyra_version != needs.check_changelog.outputs.next_version ) && ( github.ref == 'refs/heads/master' || github.base_ref == 'master' ) + if: ( env.pyra_version != needs.check_changelog.outputs.next_version ) && ( github.ref == 'refs/heads/master' || github.base_ref == 'master' ) # yamllint disable-line rule:line-length run: | echo "Version number in pyra/version.py does not match version in CHANGELOG.md" exit 1 @@ -69,9 +71,9 @@ jobs: matrix: os: [windows-2019, ubuntu-18.04, macos-10.15] architecture: [x64] - include: # additional runs - - os: windows-2019 - architecture: x86 + include: # additional runs + - os: windows-2019 + architecture: x86 runs-on: ${{ matrix.os }} needs: [check_changelog, version_check] diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml index 76af2900b..cacdfbbb2 100644 --- a/.github/workflows/ci-docker.yml +++ b/.github/workflows/ci-docker.yml @@ -1,3 +1,4 @@ +--- # This action is centrally managed in https://github.com//.github/ # Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in # the above-mentioned repo. @@ -17,17 +18,17 @@ jobs: name: Check Changelog runs-on: ubuntu-latest steps: - - name: Checkout - if: ${{ github.ref == 'refs/heads/master' || github.base_ref == 'master' }} - uses: actions/checkout@v3 - - - name: Verify Changelog - id: verify_changelog - if: ${{ github.ref == 'refs/heads/master' || github.base_ref == 'master' }} - # base_ref for pull request check, ref for push - uses: LizardByte/.github/actions/verify_changelog@master - with: - token: ${{ secrets.GITHUB_TOKEN }} + - name: Checkout + if: ${{ github.ref == 'refs/heads/master' || github.base_ref == 'master' }} + uses: actions/checkout@v3 + + - name: Verify Changelog + id: verify_changelog + if: ${{ github.ref == 'refs/heads/master' || github.base_ref == 'master' }} + # base_ref for pull request check, ref for push + uses: LizardByte/.github/actions/verify_changelog@master + with: + token: ${{ secrets.GITHUB_TOKEN }} outputs: next_version: ${{ steps.verify_changelog.outputs.changelog_parser_version }} @@ -49,13 +50,13 @@ jobs: run: | # get branch name BRANCH=${GITHUB_HEAD_REF} - + if [ -z "$BRANCH" ] then echo "This is a PUSH event" BRANCH=${{ github.ref_name }} fi - + # determine to push image to dockerhub and ghcr or not if [[ $GITHUB_EVENT_NAME == "push" ]]; then PUSH=true @@ -67,7 +68,7 @@ jobs: REPOSITORY=${{ github.repository }} BASE_TAG=$(echo $REPOSITORY | tr '[:upper:]' '[:lower:]') COMMIT=${{ github.sha }} - + TAGS="${BASE_TAG}:${COMMIT:0:7},ghcr.io/${BASE_TAG}:${COMMIT:0:7}" if [[ $GITHUB_REF == refs/heads/master ]]; then @@ -82,7 +83,7 @@ jobs: if [[ ${NEXT_VERSION} != "" ]]; then TAGS="${TAGS},${BASE_TAG}:${NEXT_VERSION},ghcr.io/${BASE_TAG}:${NEXT_VERSION}" fi - + # read the platforms from `.docker_platforms` PLATFORMS=$(<.docker_platforms) diff --git a/.github/workflows/localize.yml b/.github/workflows/localize.yml index 9018447e7..6c6fbfac2 100644 --- a/.github/workflows/localize.yml +++ b/.github/workflows/localize.yml @@ -1,3 +1,4 @@ +--- name: localize on: @@ -17,57 +18,57 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v3 - - name: Install Python 3.9 - uses: actions/setup-python@v3 # https://github.com/actions/setup-python - with: - python-version: '3.9' + - name: Install Python 3.9 + uses: actions/setup-python@v3 # https://github.com/actions/setup-python + with: + python-version: '3.9' - - name: Set up Python 3.9 Dependencies - run: | - python -m pip install --upgrade pip setuptools - python -m pip install -r requirements.txt + - name: Set up Python 3.9 Dependencies + run: | + python -m pip install --upgrade pip setuptools + python -m pip install -r requirements.txt - - name: Update Strings - run: | - python ./scripts/_locale.py --extract + - name: Update Strings + run: | + python ./scripts/_locale.py --extract - - name: git diff - run: | - # disable the pager - git config --global pager.diff false + - name: git diff + run: | + # disable the pager + git config --global pager.diff false - # print the git diff - git diff locale/retroarcher.po + # print the git diff + git diff locale/retroarcher.po - # set the variable with minimal output - OUTPUT=$(git diff --numstat locale/retroarcher.po) - echo "git_diff=${OUTPUT}" >> $GITHUB_ENV + # set the variable with minimal output + OUTPUT=$(git diff --numstat locale/retroarcher.po) + echo "git_diff=${OUTPUT}" >> $GITHUB_ENV - - name: git reset - if: ${{ env.git_diff == '1 1 locale/retroarcher.po' }} # only run if more than 1 line changed - run: | - git reset --hard + - name: git reset + if: ${{ env.git_diff == '1\t1\tlocale/retroarcher.po' }} # only run if more than 1 line changed + run: | + git reset --hard - - name: Create/Update Pull Request - uses: peter-evans/create-pull-request@v4 - with: - add-paths: | - locale/*.po - token: ${{ secrets.GH_PAT }} # must trigger PR tests - commit-message: New localization template - branch: localize/update - delete-branch: true - base: nightly - title: New Babel Updates - body: | - Update report - - Updated with *today's* date - - Auto-generated by [create-pull-request][1] + - name: Create/Update Pull Request + uses: peter-evans/create-pull-request@v4 + with: + add-paths: | + locale/*.po + token: ${{ secrets.GH_PAT }} # must trigger PR tests + commit-message: New localization template + branch: localize/update + delete-branch: true + base: nightly + title: New Babel Updates + body: | + Update report + - Updated with *today's* date + - Auto-generated by [create-pull-request][1] - [1]: https://github.com/peter-evans/create-pull-request - labels: | - babel - l10n + [1]: https://github.com/peter-evans/create-pull-request + labels: | + babel + l10n diff --git a/.github/workflows/python-flake8.yml b/.github/workflows/python-flake8.yml index 8769016f2..463fb8a20 100644 --- a/.github/workflows/python-flake8.yml +++ b/.github/workflows/python-flake8.yml @@ -1,3 +1,4 @@ +--- # This action is centrally managed in https://github.com//.github/ # Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in # the above-mentioned repo. diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml index ac3223e20..01a429207 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -1,3 +1,4 @@ +--- name: Python Tests on: @@ -10,11 +11,11 @@ jobs: strategy: fail-fast: false matrix: - os: [ windows-2019, ubuntu-18.04, macos-10.15 ] - architecture: [ x64 ] - include: # additional runs - - os: windows-2019 - architecture: x86 + os: [windows-2019, ubuntu-18.04, macos-10.15] + architecture: [x64] + include: # additional runs + - os: windows-2019 + architecture: x86 runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/release-notifier.yml b/.github/workflows/release-notifier.yml index 6b33643b5..7a2c13ea5 100644 --- a/.github/workflows/release-notifier.yml +++ b/.github/workflows/release-notifier.yml @@ -1,3 +1,4 @@ +--- # This action is centrally managed in https://github.com//.github/ # Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in # the above-mentioned repo. diff --git a/.readthedocs.yaml b/.readthedocs.yaml index a5a11785d..04f2c0a3d 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -1,3 +1,4 @@ +--- # .readthedocs.yaml # Read the Docs configuration file # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details diff --git a/crowdin.yml b/crowdin.yml index ca9c8c5c5..0be504ba7 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -1,3 +1,4 @@ +--- "base_path": "." "base_url": "https://api.crowdin.com" # optional (for Crowdin Enterprise only) "preserve_hierarchy": false # flatten tree on crowdin @@ -6,10 +7,10 @@ "l10n" ] -"files" : [ +"files": [ { - "source" : "/locale/*.po", - "translation" : "/locale/%two_letters_code%/LC_MESSAGES/%original_file_name%", + "source": "/locale/*.po", + "translation": "/locale/%two_letters_code%/LC_MESSAGES/%original_file_name%", "languages_mapping": { "two_letters_code": { # map non-two letter codes here, left side is crowdin designation, right side is babel designation