From 662ac5fab49cb1857f29439a37432a31179bb554 Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Tue, 24 Feb 2026 09:50:31 +0000 Subject: [PATCH] Use google/yamlfmt For consistency. This is used by everyone else in S-CORE. --- .github/dependabot.yml | 4 ---- .github/workflows/ci.yaml | 12 ----------- .github/workflows/release.yaml | 10 --------- .pre-commit-config.yaml | 12 +++-------- .../.devcontainer/bazel-feature/versions.yaml | 6 ------ .../.devcontainer/s-core-local/versions.yaml | 21 ------------------- 6 files changed, 3 insertions(+), 62 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 17728a0..84451bf 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,4 +1,3 @@ ---- # ******************************************************************************* # Copyright (c) 2026 Contributors to the Eclipse Foundation # @@ -12,7 +11,6 @@ # SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* - version: 2 updates: # GitHub Actions @@ -20,13 +18,11 @@ updates: directory: / schedule: interval: daily - # Docker base images - package-ecosystem: docker directory: / schedule: interval: daily - # DevContainer - package-ecosystem: devcontainers directory: / diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d52ff24..a7bbb54 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,4 +1,3 @@ ---- # ******************************************************************************* # Copyright (c) 2026 Contributors to the Eclipse Foundation # @@ -12,7 +11,6 @@ # SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* - name: Validate DevContainer description: This workflow is checking that updates do not break stuff. If on main branch, publish to "latest" tag. on: @@ -20,11 +18,9 @@ on: push: branches: - main - concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true - jobs: build: strategy: @@ -37,26 +33,22 @@ jobs: - os: arm64 name: DevContainer (arm64) runner: ubuntu-24.04-arm - name: ${{ matrix.name }} runs-on: ${{ matrix.runner }} permissions: contents: read packages: write id-token: write - steps: - uses: eclipse-score/more-disk-space@v1 - name: Checkout (GitHub) uses: actions/checkout@v6 - - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - # Use .devcontainer from THIS repo for building and testing - name: Check, Build, Test, Publish uses: devcontainers/ci@v0.3 @@ -87,7 +79,6 @@ jobs: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin ./scripts/publish.sh --${{ matrix.os }} "main" fi - merge: name: Merge Labels (main only) needs: [build] @@ -97,19 +88,16 @@ jobs: contents: read packages: write id-token: write - steps: - uses: eclipse-score/more-disk-space@v1 - name: Checkout (GitHub) uses: actions/checkout@v6 - - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - # Use .devcontainer from THIS repo for building and testing - name: Merge uses: devcontainers/ci@v0.3 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 87b16cd..d2b0551 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,4 +1,3 @@ ---- # ******************************************************************************* # Copyright (c) 2026 Contributors to the Eclipse Foundation # @@ -12,7 +11,6 @@ # SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* - name: Validate & Publish DevContainer description: This workflow is checking that for releases, updates do not break stuff and publishes the released container. on: @@ -31,26 +29,22 @@ jobs: - os: arm64 name: DevContainer (arm64) runner: ubuntu-24.04-arm - name: ${{ matrix.name }} runs-on: ${{ matrix.runner }} permissions: contents: read packages: write id-token: write - steps: - uses: eclipse-score/more-disk-space@v1 - name: Checkout (GitHub) uses: actions/checkout@v6 - - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - # Use .devcontainer from THIS repo for building and testing - name: Check, Build, Test, Publish uses: devcontainers/ci@v0.3 @@ -79,7 +73,6 @@ jobs: # manually login to ghcr.io for publishing echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin ./scripts/publish.sh --${{ matrix.os }} "${{ github.ref_name }}" "latest" - merge: name: Merge Labels needs: [build] @@ -88,19 +81,16 @@ jobs: contents: read packages: write id-token: write - steps: - uses: eclipse-score/more-disk-space@v1 - name: Checkout (GitHub) uses: actions/checkout@v6 - - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - # Use .devcontainer from THIS repo for building and testing - name: Merge uses: devcontainers/ci@v0.3 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f68ade3..89c3eae 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,4 +1,3 @@ ---- # ******************************************************************************* # Copyright (c) 2026 Contributors to the Eclipse Foundation # @@ -12,10 +11,9 @@ # SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* - repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: 3e8a8703264a2f4a69428a0aa4dcb512790b2c8c # v6.0.0 + rev: 3e8a8703264a2f4a69428a0aa4dcb512790b2c8c # v6.0.0 hooks: - id: check-yaml - id: end-of-file-fixer @@ -25,18 +23,14 @@ repos: - id: check-executables-have-shebangs - id: check-added-large-files args: [--maxkb=50, --enforce-all] # increase or add git lfs if too strict - - - repo: https://github.com/jumanjihouse/pre-commit-hook-yamlfmt - rev: 8d1b9cadaf854cb25bb0b0f5870e1cc66a083d6b # 0.2.3 + - repo: https://github.com/google/yamlfmt + rev: 21ca5323a9c87ee37a434e0ca908efc0a89daa07 # v0.21.0 hooks: - id: yamlfmt - args: [--mapping, '2', --offset, '2', --sequence, '4'] - - repo: https://github.com/jumanjihouse/pre-commit-hooks rev: 38980559e3a605691d6579f96222c30778e5a69e # 3.0.0 hooks: - id: shellcheck - - repo: local hooks: - id: reuse annotate diff --git a/src/s-core-devcontainer/.devcontainer/bazel-feature/versions.yaml b/src/s-core-devcontainer/.devcontainer/bazel-feature/versions.yaml index 515f4a3..19324c9 100644 --- a/src/s-core-devcontainer/.devcontainer/bazel-feature/versions.yaml +++ b/src/s-core-devcontainer/.devcontainer/bazel-feature/versions.yaml @@ -1,4 +1,3 @@ ---- # ******************************************************************************* # Copyright (c) 2026 Contributors to the Eclipse Foundation # @@ -12,12 +11,10 @@ # SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* - bazel: # https://github.com/bazelbuild/bazel/releases -- latest version as of 2025-09-24 version: 8.4.1 # no need to define sha256 here, as bazel is installed via bazelisk - buildifier: version: 8.2.1 amd64: @@ -30,7 +27,6 @@ buildifier: # from the GitHub release page of buildtools # It is generated by running 'sha256sum buildifier-linux-arm64' sha256: 3baa1cf7eb41d51f462fdd1fff3a6a4d81d757275d05b2dd5f48671284e9a1a5 - bazelisk: version: 1.27.0 amd64: @@ -41,7 +37,6 @@ bazelisk: # The following sha256sums are for the deb package bazelisk__arm64.deb # It is generated by running 'sha256sum bazelisk__arm64.deb' sha256: 173c5b367b485a30ce58c1d0d560b39d257a2d7a3c859c45d7d05eb61605a2a1 - starpls: version: 0.1.22 amd64: @@ -54,7 +49,6 @@ starpls: # from the GitHub release page of starpls # It is generated by running 'sha256sum starpls-linux-arm64' sha256: 55877ec4c3ff03e1d90d59c76f69a3a144b6c29688747c8ac4d77993e2eef1ad - bazel_compile_commands: version: 0.18.0 amd64: diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml b/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml index 80d7426..f53ff93 100644 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml @@ -1,4 +1,3 @@ ---- # ******************************************************************************* # Copyright (c) 2026 Contributors to the Eclipse Foundation # @@ -12,71 +11,54 @@ # SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* - actionlint: version: 1.7.7 amd64: sha256: 023070a287cd8cccd71515fedc843f1985bf96c436b7effaecce67290e7e0757 arm64: sha256: 401942f9c24ed71e4fe71b76c7d638f66d8633575c4016efd2977ce7c28317d0 - basedpyright: version: 1.35.0 - graphviz: version: 2.42.2 - protobuf_compiler: version: 3.21.12 - qemu_system_arm: version: 1:8.2.2 - sshpass: version: 1.09 - gdb: version: 15.0.50 - git: version: 2.43.0 - git_lfs: version: 3.4.1 - python: version: '3.12' - pytest: version: 9.0.2 - gh: version: 2.45.0 - openjdk_21: version: 21.0.10 - ruff: version: 0.11.13 amd64: sha256: 01aa32d29d00876b8d1429c617ed63a00b1fc81abfa4183bb05c9cb647fbc3d0 arm64: sha256: 551af2ebc439d8268dcaf871ea60ad035f688728d30943dcbb2bf775e105213e - shellcheck: version: 0.10.0 amd64: sha256: 6c881ab0698e4e6ea235245f22832860544f17ba386442fe7e9d629f8cbedf87 arm64: sha256: 324a7e89de8fa2aed0d0c28f3dab59cf84c6d74264022c00c22af665ed1a09bb - uv: version: 0.10.4 amd64: sha256: 6b52a47358deea1c5e173278bf46b2b489747a59ae31f2a4362ed5c6c1c269f7 arm64: sha256: c84a6e6405715caa6e2f5ef8e5f29a5d0bc558a954e9f1b5c082b9d4708c222e - codeql: # the coding_standards_version below dictates the codeql version version: 2.21.4 @@ -86,13 +68,10 @@ codeql: arm64: # see https://github.com/github/codeql-action/releases/download/codeql-bundle-v${codeql_version}/codeql-bundle-osx64.tar.zst.checksum.txt sha256: 810a1fff48aeb081be754e46e255edd90d8695966e78431a65edb00e9e6cc399 - codeql_coding_standards: version: 2.54.0 - valgrind: version: 3.22.0 - yamlfmt: version: 0.17.0 amd64: