mirror of
https://github.com/super-linter/super-linter.git
synced 2024-11-25 07:31:05 -05:00
Bump scalameta/scalafmt from 3.7.3 to v3.7.15 (#4790)
* Bump scalameta/scalafmt from 3.7.3 to v3.7.15 Bumps scalameta/scalafmt from 3.7.3 to v3.7.15. --- updated-dependencies: - dependency-name: scalameta/scalafmt dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * Create sync-scala-version.yaml * checkout on branch instead of headless * Update scala config version to match version installed * Add yaml header * rm EOL whitespace * remove useless cat cmds --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Zack Koppert <zkoppert@github.com> Co-authored-by: zkoppert <zkoppert@users.noreply.github.com>
This commit is contained in:
parent
9ee2eed763
commit
414a5e5ce0
3 changed files with 38 additions and 2 deletions
36
.github/workflows/sync-scala-version.yaml
vendored
Normal file
36
.github/workflows/sync-scala-version.yaml
vendored
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
---
|
||||||
|
|
||||||
|
name: Sync scala format version between Dockerfile and config file
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
paths:
|
||||||
|
- 'Dockerfile'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
with:
|
||||||
|
repository: ${{ github.event.pull_request.head.repo.full_name }}
|
||||||
|
ref: ${{ github.event.pull_request.head.ref }}
|
||||||
|
|
||||||
|
- name: Sync the version if the dockerfile is getting updated
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
scala_version_from_dockerfile=$(grep 'scalameta/scalafmt' Dockerfile | awk -F: '{print $2}' | awk '{print $1}')
|
||||||
|
scala_version_from_dockerfile=${scala_version_from_dockerfile#v}
|
||||||
|
|
||||||
|
scala_version_from_config=$(grep 'version =' TEMPLATES/.scalafmt.conf | awk -F= '{print $2}' | tr -d '[:space:]')
|
||||||
|
|
||||||
|
echo "scala_version_from_dockerfile: $scala_version_from_dockerfile"
|
||||||
|
echo "scala_version_from_config: $scala_version_from_config"
|
||||||
|
|
||||||
|
if [ "$scala_version_from_dockerfile" != "$scala_version_from_config" ]; then echo "versions differ"; sed -i "s/\(version =\).*/\1 ${scala_version_from_dockerfile}/g" TEMPLATES/.scalafmt.conf; fi
|
||||||
|
- uses: EndBug/add-and-commit@v9 # You can change this to use a specific version.
|
||||||
|
with:
|
||||||
|
add: 'TEMPLATES/.scalafmt.conf'
|
||||||
|
fetch: false
|
||||||
|
message: 'Update scala config version to match version installed'
|
|
@ -22,7 +22,7 @@ FROM koalaman/shellcheck:v0.9.0 as shellcheck
|
||||||
FROM mstruebing/editorconfig-checker:2.7.2 as editorconfig-checker
|
FROM mstruebing/editorconfig-checker:2.7.2 as editorconfig-checker
|
||||||
FROM mvdan/shfmt:v3.7.0 as shfmt
|
FROM mvdan/shfmt:v3.7.0 as shfmt
|
||||||
FROM rhysd/actionlint:1.6.26 as actionlint
|
FROM rhysd/actionlint:1.6.26 as actionlint
|
||||||
FROM scalameta/scalafmt:v3.7.3 as scalafmt
|
FROM scalameta/scalafmt:v3.7.15 as scalafmt
|
||||||
FROM zricethezav/gitleaks:v8.18.0 as gitleaks
|
FROM zricethezav/gitleaks:v8.18.0 as gitleaks
|
||||||
FROM yoheimuta/protolint:0.46.2 as protolint
|
FROM yoheimuta/protolint:0.46.2 as protolint
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
// Scala Format Configuration
|
// Scala Format Configuration
|
||||||
// https://scalameta.org/scalafmt/docs/configuration.html
|
// https://scalameta.org/scalafmt/docs/configuration.html
|
||||||
version = 3.7.3
|
version = 3.7.15
|
||||||
align.preset = more // For pretty alignment.
|
align.preset = more // For pretty alignment.
|
||||||
maxColumn = 80
|
maxColumn = 80
|
||||||
// https://scalameta.org/scalafmt/docs/configuration.html#scala-dialects
|
// https://scalameta.org/scalafmt/docs/configuration.html#scala-dialects
|
||||||
|
|
Loading…
Reference in a new issue