From a473e32e91b402e6868656f759e5476ca9248154 Mon Sep 17 00:00:00 2001 From: Vasiliy Vasilyuk Date: Thu, 10 Oct 2024 23:31:55 +0300 Subject: [PATCH] Change formatting of yaml files yaml files reformated by `ansible-lint --fix` --- .editorconfig | 10 +++ .github/dependabot.yml | 7 ++- .github/workflows/shell.yml | 118 ++++++++++++++++++------------------ 3 files changed, 73 insertions(+), 62 deletions(-) diff --git a/.editorconfig b/.editorconfig index 08336c6..c88b445 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,3 +13,13 @@ indent_style = tab [{*.yml,*.yaml}] indent_size = 2 +ij_yaml_align_values_properties = do_not_align +ij_yaml_autoinsert_sequence_marker = true +ij_yaml_block_mapping_on_new_line = false +ij_yaml_indent_sequence_value = true +ij_yaml_keep_indents_on_empty_lines = false +ij_yaml_keep_line_breaks = true +ij_yaml_sequence_on_new_line = false +ij_yaml_space_before_colon = false +ij_yaml_spaces_within_braces = false +ij_yaml_spaces_within_brackets = false diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 44ca17c..60b74b6 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,8 +1,9 @@ +--- # See https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file version: 2 updates: - - package-ecosystem: "github-actions" - directory: "/" + - package-ecosystem: github-actions + directory: / schedule: - interval: "monthly" + interval: monthly diff --git a/.github/workflows/shell.yml b/.github/workflows/shell.yml index afdbd5a..9363644 100644 --- a/.github/workflows/shell.yml +++ b/.github/workflows/shell.yml @@ -1,87 +1,87 @@ +--- name: Shell on: push: - branches: [ main ] + branches: [main] pull_request: - branches: [ main ] + branches: [main] workflow_dispatch: - jobs: lint-shell-scripts: name: Lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - name: Run shfmt and shellcheck - uses: luizm/action-sh-checker@v0.9.0 - env: - SHFMT_OPTS: -d -s -w -i 4 -ln bash + - uses: actions/checkout@v4 + - name: Run shfmt and shellcheck + uses: luizm/action-sh-checker@v0.9.0 + env: + SHFMT_OPTS: -d -s -w -i 4 -ln bash check-script-logic: name: Check pkg:${{ matrix.pkg }} os:${{ matrix.os }} - runs-on: '${{ matrix.os }}' + runs-on: ${{ matrix.os }} strategy: matrix: os: - - ubuntu-latest - - macos-latest + - ubuntu-latest + - macos-latest pkg: - - all - - go + - all + - go fail-fast: false steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4 - - name: Set up Go - uses: actions/setup-go@v5 - with: - go-version: '1.23.1' - cache: false + - name: Set up Go + uses: actions/setup-go@v5 + with: + go-version: 1.23.1 + cache: false - - name: Configure test repository - run: | - git clone https://github.com/xorcare/tornado + - name: Configure test repository + run: | + git clone https://github.com/xorcare/tornado - - name: Setup git user - working-directory: tornado - run: | - git config user.email "you@example.com" - git config user.name "Your Name" + - name: Setup git user + working-directory: tornado + run: | + git config user.email "you@example.com" + git config user.name "Your Name" - - name: Zero exit code when use help flags - working-directory: tornado - run: | - ../go-mod-bump.sh -h - ../go-mod-bump.sh -help + - name: Zero exit code when use help flags + working-directory: tornado + run: | + ../go-mod-bump.sh -h + ../go-mod-bump.sh -help - - name: Zero exit code when module name is not set - working-directory: tornado - run: | - ../go-mod-bump.sh + - name: Zero exit code when module name is not set + working-directory: tornado + run: | + ../go-mod-bump.sh - - name: Update dependencies when there is something to update - working-directory: tornado - run: | - git checkout --force --quiet 029fe5d254ab71c1e72444adcda808f5a494084d - ../go-mod-bump.sh ${{ matrix.pkg }} - commit_count=$(git rev-list --count HEAD ^029fe5d254ab71c1e72444adcda808f5a494084d) - if [[ "$commit_count" == 0 ]]; then - echo "ERROR: No changes have been detected, but they must be exist" - exit 1 - fi - git diff 029fe5d254ab71c1e72444adcda808f5a494084d + - name: Update dependencies when there is something to update + working-directory: tornado + run: | + git checkout --force --quiet 029fe5d254ab71c1e72444adcda808f5a494084d + ../go-mod-bump.sh ${{ matrix.pkg }} + commit_count=$(git rev-list --count HEAD ^029fe5d254ab71c1e72444adcda808f5a494084d) + if [[ "$commit_count" == 0 ]]; then + echo "ERROR: No changes have been detected, but they must be exist" + exit 1 + fi + git diff 029fe5d254ab71c1e72444adcda808f5a494084d - - name: Zero exit code when nothing to update - working-directory: tornado - run: | - git checkout --force --quiet 029fe5d254ab71c1e72444adcda808f5a494084d - ../go-mod-bump.sh ${{ matrix.pkg }} # update - ../go-mod-bump.sh ${{ matrix.pkg }} # nothing to update + - name: Zero exit code when nothing to update + working-directory: tornado + run: | + git checkout --force --quiet 029fe5d254ab71c1e72444adcda808f5a494084d + ../go-mod-bump.sh ${{ matrix.pkg }} # update + ../go-mod-bump.sh ${{ matrix.pkg }} # nothing to update - - name: Zero exit code when no have direct modules - run: | - mkdir testo - cd testo - go mod init testo - ../go-mod-bump.sh all + - name: Zero exit code when no have direct modules + run: | + mkdir testo + cd testo + go mod init testo + ../go-mod-bump.sh all