Skip to content

Commit d8e4b31

Browse files
lurtzlurtz
authored
Use google/yamlfmt (#97)
For consistency. This is used by everyone else in S-CORE.
1 parent fc21e66 commit d8e4b31

6 files changed

Lines changed: 3 additions & 62 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
# *******************************************************************************
32
# Copyright (c) 2026 Contributors to the Eclipse Foundation
43
#
@@ -12,21 +11,18 @@
1211
# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation
1312
# SPDX-License-Identifier: Apache-2.0
1413
# *******************************************************************************
15-
1614
version: 2
1715
updates:
1816
# GitHub Actions
1917
- package-ecosystem: github-actions
2018
directory: /
2119
schedule:
2220
interval: daily
23-
2421
# Docker base images
2522
- package-ecosystem: docker
2623
directory: /
2724
schedule:
2825
interval: daily
29-
3026
# DevContainer
3127
- package-ecosystem: devcontainers
3228
directory: /

‎.github/workflows/ci.yaml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
# *******************************************************************************
32
# Copyright (c) 2026 Contributors to the Eclipse Foundation
43
#
@@ -12,19 +11,16 @@
1211
# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation
1312
# SPDX-License-Identifier: Apache-2.0
1413
# *******************************************************************************
15-
1614
name: Validate DevContainer
1715
description: This workflow is checking that updates do not break stuff. If on main branch, publish to "latest" tag.
1816
on:
1917
pull_request:
2018
push:
2119
branches:
2220
- main
23-
2421
concurrency:
2522
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
2623
cancel-in-progress: true
27-
2824
jobs:
2925
build:
3026
strategy:
@@ -37,26 +33,22 @@ jobs:
3733
- os: arm64
3834
name: DevContainer (arm64)
3935
runner: ubuntu-24.04-arm
40-
4136
name: ${{ matrix.name }}
4237
runs-on: ${{ matrix.runner }}
4338
permissions:
4439
contents: read
4540
packages: write
4641
id-token: write
47-
4842
steps:
4943
- uses: eclipse-score/more-disk-space@v1
5044
- name: Checkout (GitHub)
5145
uses: actions/checkout@v6
52-
5346
- name: Login to GitHub Container Registry
5447
uses: docker/login-action@v3
5548
with:
5649
registry: ghcr.io
5750
username: ${{ github.actor }}
5851
password: ${{ secrets.GITHUB_TOKEN }}
59-
6052
# Use .devcontainer from THIS repo for building and testing
6153
- name: Check, Build, Test, Publish
6254
uses: devcontainers/ci@v0.3
@@ -87,7 +79,6 @@ jobs:
8779
echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
8880
./scripts/publish.sh --${{ matrix.os }} "main"
8981
fi
90-
9182
merge:
9283
name: Merge Labels (main only)
9384
needs: [build]
@@ -97,19 +88,16 @@ jobs:
9788
contents: read
9889
packages: write
9990
id-token: write
100-
10191
steps:
10292
- uses: eclipse-score/more-disk-space@v1
10393
- name: Checkout (GitHub)
10494
uses: actions/checkout@v6
105-
10695
- name: Login to GitHub Container Registry
10796
uses: docker/login-action@v3
10897
with:
10998
registry: ghcr.io
11099
username: ${{ github.actor }}
111100
password: ${{ secrets.GITHUB_TOKEN }}
112-
113101
# Use .devcontainer from THIS repo for building and testing
114102
- name: Merge
115103
uses: devcontainers/ci@v0.3

‎.github/workflows/release.yaml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
# *******************************************************************************
32
# Copyright (c) 2026 Contributors to the Eclipse Foundation
43
#
@@ -12,7 +11,6 @@
1211
# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation
1312
# SPDX-License-Identifier: Apache-2.0
1413
# *******************************************************************************
15-
1614
name: Validate & Publish DevContainer
1715
description: This workflow is checking that for releases, updates do not break stuff and publishes the released container.
1816
on:
@@ -31,26 +29,22 @@ jobs:
3129
- os: arm64
3230
name: DevContainer (arm64)
3331
runner: ubuntu-24.04-arm
34-
3532
name: ${{ matrix.name }}
3633
runs-on: ${{ matrix.runner }}
3734
permissions:
3835
contents: read
3936
packages: write
4037
id-token: write
41-
4238
steps:
4339
- uses: eclipse-score/more-disk-space@v1
4440
- name: Checkout (GitHub)
4541
uses: actions/checkout@v6
46-
4742
- name: Login to GitHub Container Registry
4843
uses: docker/login-action@v3
4944
with:
5045
registry: ghcr.io
5146
username: ${{ github.actor }}
5247
password: ${{ secrets.GITHUB_TOKEN }}
53-
5448
# Use .devcontainer from THIS repo for building and testing
5549
- name: Check, Build, Test, Publish
5650
uses: devcontainers/ci@v0.3
@@ -79,7 +73,6 @@ jobs:
7973
# manually login to ghcr.io for publishing
8074
echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
8175
./scripts/publish.sh --${{ matrix.os }} "${{ github.ref_name }}" "latest"
82-
8376
merge:
8477
name: Merge Labels
8578
needs: [build]
@@ -88,19 +81,16 @@ jobs:
8881
contents: read
8982
packages: write
9083
id-token: write
91-
9284
steps:
9385
- uses: eclipse-score/more-disk-space@v1
9486
- name: Checkout (GitHub)
9587
uses: actions/checkout@v6
96-
9788
- name: Login to GitHub Container Registry
9889
uses: docker/login-action@v3
9990
with:
10091
registry: ghcr.io
10192
username: ${{ github.actor }}
10293
password: ${{ secrets.GITHUB_TOKEN }}
103-
10494
# Use .devcontainer from THIS repo for building and testing
10595
- name: Merge
10696
uses: devcontainers/ci@v0.3

‎.pre-commit-config.yaml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
# *******************************************************************************
32
# Copyright (c) 2026 Contributors to the Eclipse Foundation
43
#
@@ -12,10 +11,9 @@
1211
# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation
1312
# SPDX-License-Identifier: Apache-2.0
1413
# *******************************************************************************
15-
1614
repos:
1715
- repo: https://github.com/pre-commit/pre-commit-hooks
18-
rev: 3e8a8703264a2f4a69428a0aa4dcb512790b2c8c # v6.0.0
16+
rev: 3e8a8703264a2f4a69428a0aa4dcb512790b2c8c # v6.0.0
1917
hooks:
2018
- id: check-yaml
2119
- id: end-of-file-fixer
@@ -25,18 +23,14 @@ repos:
2523
- id: check-executables-have-shebangs
2624
- id: check-added-large-files
2725
args: [--maxkb=50, --enforce-all] # increase or add git lfs if too strict
28-
29-
- repo: https://github.com/jumanjihouse/pre-commit-hook-yamlfmt
30-
rev: 8d1b9cadaf854cb25bb0b0f5870e1cc66a083d6b # 0.2.3
26+
- repo: https://github.com/google/yamlfmt
27+
rev: 21ca5323a9c87ee37a434e0ca908efc0a89daa07 # v0.21.0
3128
hooks:
3229
- id: yamlfmt
33-
args: [--mapping, '2', --offset, '2', --sequence, '4']
34-
3530
- repo: https://github.com/jumanjihouse/pre-commit-hooks
3631
rev: 38980559e3a605691d6579f96222c30778e5a69e # 3.0.0
3732
hooks:
3833
- id: shellcheck
39-
4034
- repo: local
4135
hooks:
4236
- id: reuse annotate

‎src/s-core-devcontainer/.devcontainer/bazel-feature/versions.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
# *******************************************************************************
32
# Copyright (c) 2026 Contributors to the Eclipse Foundation
43
#
@@ -12,12 +11,10 @@
1211
# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation
1312
# SPDX-License-Identifier: Apache-2.0
1413
# *******************************************************************************
15-
1614
bazel:
1715
# https://github.com/bazelbuild/bazel/releases -- latest version as of 2025-09-24
1816
version: 8.4.1
1917
# no need to define sha256 here, as bazel is installed via bazelisk
20-
2118
buildifier:
2219
version: 8.2.1
2320
amd64:
@@ -30,7 +27,6 @@ buildifier:
3027
# from the GitHub release page of buildtools
3128
# It is generated by running 'sha256sum buildifier-linux-arm64'
3229
sha256: 3baa1cf7eb41d51f462fdd1fff3a6a4d81d757275d05b2dd5f48671284e9a1a5
33-
3430
bazelisk:
3531
version: 1.27.0
3632
amd64:
@@ -41,7 +37,6 @@ bazelisk:
4137
# The following sha256sums are for the deb package bazelisk_<version>_arm64.deb
4238
# It is generated by running 'sha256sum bazelisk_<version>_arm64.deb'
4339
sha256: 173c5b367b485a30ce58c1d0d560b39d257a2d7a3c859c45d7d05eb61605a2a1
44-
4540
starpls:
4641
version: 0.1.22
4742
amd64:
@@ -54,7 +49,6 @@ starpls:
5449
# from the GitHub release page of starpls
5550
# It is generated by running 'sha256sum starpls-linux-arm64'
5651
sha256: 55877ec4c3ff03e1d90d59c76f69a3a144b6c29688747c8ac4d77993e2eef1ad
57-
5852
bazel_compile_commands:
5953
version: 0.18.0
6054
amd64:

‎src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
# *******************************************************************************
32
# Copyright (c) 2026 Contributors to the Eclipse Foundation
43
#
@@ -12,71 +11,54 @@
1211
# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation
1312
# SPDX-License-Identifier: Apache-2.0
1413
# *******************************************************************************
15-
1614
actionlint:
1715
version: 1.7.7
1816
amd64:
1917
sha256: 023070a287cd8cccd71515fedc843f1985bf96c436b7effaecce67290e7e0757
2018
arm64:
2119
sha256: 401942f9c24ed71e4fe71b76c7d638f66d8633575c4016efd2977ce7c28317d0
22-
2320
basedpyright:
2421
version: 1.35.0
25-
2622
graphviz:
2723
version: 2.42.2
28-
2924
protobuf_compiler:
3025
version: 3.21.12
31-
3226
qemu_system_arm:
3327
version: 1:8.2.2
34-
3528
sshpass:
3629
version: 1.09
37-
3830
gdb:
3931
version: 15.0.50
40-
4132
git:
4233
version: 2.43.0
43-
4434
git_lfs:
4535
version: 3.4.1
46-
4736
python:
4837
version: '3.12'
49-
5038
pytest:
5139
version: 9.0.2
52-
5340
gh:
5441
version: 2.45.0
55-
5642
openjdk_21:
5743
version: 21.0.10
58-
5944
ruff:
6045
version: 0.11.13
6146
amd64:
6247
sha256: 01aa32d29d00876b8d1429c617ed63a00b1fc81abfa4183bb05c9cb647fbc3d0
6348
arm64:
6449
sha256: 551af2ebc439d8268dcaf871ea60ad035f688728d30943dcbb2bf775e105213e
65-
6650
shellcheck:
6751
version: 0.10.0
6852
amd64:
6953
sha256: 6c881ab0698e4e6ea235245f22832860544f17ba386442fe7e9d629f8cbedf87
7054
arm64:
7155
sha256: 324a7e89de8fa2aed0d0c28f3dab59cf84c6d74264022c00c22af665ed1a09bb
72-
7356
uv:
7457
version: 0.10.4
7558
amd64:
7659
sha256: 6b52a47358deea1c5e173278bf46b2b489747a59ae31f2a4362ed5c6c1c269f7
7760
arm64:
7861
sha256: c84a6e6405715caa6e2f5ef8e5f29a5d0bc558a954e9f1b5c082b9d4708c222e
79-
8062
codeql:
8163
# the coding_standards_version below dictates the codeql version
8264
version: 2.21.4
@@ -86,13 +68,10 @@ codeql:
8668
arm64:
8769
# see https://github.com/github/codeql-action/releases/download/codeql-bundle-v${codeql_version}/codeql-bundle-osx64.tar.zst.checksum.txt
8870
sha256: 810a1fff48aeb081be754e46e255edd90d8695966e78431a65edb00e9e6cc399
89-
9071
codeql_coding_standards:
9172
version: 2.54.0
92-
9373
valgrind:
9474
version: 3.22.0
95-
9675
yamlfmt:
9776
version: 0.17.0
9877
amd64:

0 commit comments

Comments
 (0)