diff --git a/.github/workflows/format.yml b/.devcontainer/Dockerfile similarity index 64% rename from .github/workflows/format.yml rename to .devcontainer/Dockerfile index 0f8ee7cd7..6bfb77362 100644 --- a/.github/workflows/format.yml +++ b/.devcontainer/Dockerfile @@ -11,15 +11,5 @@ # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -name: Formatting checks -permissions: - contents: read - actions: write -on: - pull_request: - types: [opened, reopened, synchronize] - merge_group: - types: [checks_requested] -jobs: - formatting-check: - uses: eclipse-score/cicd-workflows/.github/workflows/format.yml@f57b605a284ca117bcfd9f83ea427096faaac7d1 +# Use Dockerfile to get dependabot version bumps after new image is released +FROM ghcr.io/eclipse-score/devcontainer:v1.9.0 diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 53ab80c83..b66f7824f 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,11 +1,12 @@ { - /// This devcontainer adds some ETAS-specific customizations to the S-CORE base devcontainer + /// This devcontainer adds some specific customizations to the S-CORE base devcontainer /// Such as: /// - CA Certificates - "name": "eclipse-s-core-etas", - // Use the same image as the project's devcontainer - "image": "ghcr.io/eclipse-score/devcontainer:latest", + "name": "eclipse-s-core", + "build": { + "dockerfile": "Dockerfile" + }, "features": { "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {} diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..ca111b55b --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,46 @@ +# ******************************************************************************* +# Copyright (c) 2026 Contributors to the Eclipse Foundation +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0 +# +# SPDX-License-Identifier: Apache-2.0 +# ******************************************************************************* +version: 2 +updates: + - package-ecosystem: github-actions + directory: / + schedule: + interval: weekly + groups: + github-actions: + patterns: + - "*" + commit-message: + prefix: chore(github-actions) + + - package-ecosystem: pre-commit + directory: / + schedule: + interval: weekly + groups: + pre-commit: + patterns: + - "*" + commit-message: + prefix: chore(pre-commit) + + - package-ecosystem: docker + directory: /.devcontainer + schedule: + interval: weekly + groups: + docker: + patterns: + - "*" + commit-message: + prefix: chore(docker) diff --git a/.github/workflows/copyright.yml b/.github/workflows/copyright.yml deleted file mode 100644 index 7bf4d5741..000000000 --- a/.github/workflows/copyright.yml +++ /dev/null @@ -1,24 +0,0 @@ -# ******************************************************************************* -# Copyright (c) 2024 Contributors to the Eclipse Foundation -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0 -# -# SPDX-License-Identifier: Apache-2.0 -# ******************************************************************************* - -name: Copyright checks -on: - pull_request: - types: [opened, reopened, synchronize] - merge_group: - types: [checks_requested] -jobs: - copyright-check: - uses: eclipse-score/cicd-workflows/.github/workflows/copyright.yml@c1c90b1a82a1fab0fc202979dde6686b2162d5a8 # v0.0.0 - with: - bazel-target: "run --lockfile_mode=error //:copyright.check" diff --git a/.github/workflows/bzlmod-lock.yml b/.github/workflows/on-pr.yml similarity index 78% rename from .github/workflows/bzlmod-lock.yml rename to .github/workflows/on-pr.yml index 364e85314..768236c8b 100644 --- a/.github/workflows/bzlmod-lock.yml +++ b/.github/workflows/on-pr.yml @@ -10,7 +10,7 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -name: Bzlmod Lockfile Check +name: On PR Checks permissions: contents: read on: @@ -22,7 +22,5 @@ on: branches: - main jobs: - bzlmod-lock: - uses: eclipse-score/cicd-workflows/.github/workflows/bzlmod-lock-check.yml@c1c90b1a82a1fab0fc202979dde6686b2162d5a8 # v0.0.0 - with: - working-directory: . + common: + uses: eclipse-score/cicd-workflows/.github/workflows/on-pr.yml@on-pr/v0.0.0 diff --git a/.gitignore b/.gitignore index 9bb57db28..f3a58c2f5 100644 --- a/.gitignore +++ b/.gitignore @@ -39,8 +39,9 @@ user.bazelrc # Ruff .ruff_cache -# docs:incremental and docs:ide_support build artifacts -/_build +# docs build artifacts +_build +ubproject.toml # Vale - editorial style guide .vale.ini @@ -74,7 +75,6 @@ tests/**/*.xml *.orig .venv_docs MODULE.lock.bazel -_build/ .clwb .idea external diff --git a/MODULE.bazel b/MODULE.bazel index ab45b22bb..339213741 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -10,10 +10,7 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -module( - name = "score_lifecycle_health", - version = "0.0.0", -) +module(name = "score_lifecycle_health") # Bazel global rules bazel_dep(name = "bazel_skylib", version = "1.9.0") diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 949af6f47..7eb61df3c 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -9766,7 +9766,7 @@ "@@score_bazel_cpp_toolchains+//extensions:gcc.bzl%gcc": { "general": { "bzlTransitiveDigest": "dc5MfL+KgiCba7Ie+8RFXMg+QaVnnCWXSXUymx//0GY=", - "usagesDigest": "sGIliRFnKLYMR4SXxWxhW+Y7s4eixYJxdTGah7DDYTk=", + "usagesDigest": "4NRmsFkxvfBnjO3dxv3PUP89mkAs9rXo/+1VVvsgsJg=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -9938,7 +9938,7 @@ "@@score_rules_imagefs+//extensions:imagefs.bzl%imagefs": { "general": { "bzlTransitiveDigest": "6ZLANe53LXwcnne1ZrZm9GkJ9H5VdsCLSgSNHyUrqA4=", - "usagesDigest": "s+ssSY6E3M1aQQ9OvRbEgI7dupAmPnZzMrFtryKiBwU=", + "usagesDigest": "Ng82wBgMD3ugekwpj5E0uBy0jQDlToF9vMjBytnPdik=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -10231,7 +10231,7 @@ "@@toolchains_llvm+//toolchain/extensions:llvm.bzl%llvm": { "general": { "bzlTransitiveDigest": "2nizkGuHTT5Rnm/m2ZKyN0gz6PG1uMRn/wIec1UMxaw=", - "usagesDigest": "K9vkoZd07zvWoNXAEPmo4CkCn5JvRrJ8hLTEj+3goR4=", + "usagesDigest": "cuaIN5afQnXJ4XM0nYYQdx7Vz0ObtnK1n2vQ1F4v1JQ=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, diff --git a/conf.py b/conf.py index 70dfb7e99..43eb2d0a8 100644 --- a/conf.py +++ b/conf.py @@ -25,25 +25,13 @@ project = "Lifecycle and Health Management" project_url = "https://eclipse-score.github.io/lifecycle/" -project_prefix = "LIFE_" -author = "S-CORE" version = "0.1" # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration -extensions = [ - "sphinx_design", - "sphinx_needs", - "sphinxcontrib.plantuml", - "score_plantuml", - "score_metamodel", - "score_draw_uml_funcs", - "score_source_code_linker", - "score_layout", - "myst_parser", -] +extensions = ["score_sphinx_bundle"] include_patterns = [ "index.rst", @@ -63,11 +51,6 @@ ".venv_docs", ] -templates_path = ["templates"] - -# Enable numref -numfig = True - def setup(app): # When Sphinx runs inside a Bazel action (bazel build //:needs_json), the