From c8708f350459cd39304ea7404aaa9d173c0adc3f Mon Sep 17 00:00:00 2001 From: Danny van der Sluijs Date: Fri, 12 Dec 2025 09:47:28 +0100 Subject: [PATCH 1/2] ci: Run workflows against 5.x.x branches --- .github/workflows/continuous-integration-32-bits.yml | 2 ++ .github/workflows/continuous-integration.yml | 2 ++ .github/workflows/lint.yml | 1 + .github/workflows/style-check.yml | 2 ++ 4 files changed, 7 insertions(+) diff --git a/.github/workflows/continuous-integration-32-bits.yml b/.github/workflows/continuous-integration-32-bits.yml index 4c7d5815..2ae309a2 100644 --- a/.github/workflows/continuous-integration-32-bits.yml +++ b/.github/workflows/continuous-integration-32-bits.yml @@ -4,9 +4,11 @@ on: push: branches: - main + - 5.x.x pull_request: branches: - main + - 5.x.x env: COMPOSER_FLAGS: "--ansi --no-interaction --no-progress --prefer-dist" diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index f5632b4d..ee0fc948 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -4,9 +4,11 @@ on: push: branches: - main + - 5.x.x pull_request: branches: - main + - 5.x.x env: COMPOSER_FLAGS: "--ansi --no-interaction --no-progress --prefer-dist" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 34a45e95..90784e04 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,6 +7,7 @@ on: pull_request: branches: - main + - 5.x.x jobs: lint: diff --git a/.github/workflows/style-check.yml b/.github/workflows/style-check.yml index 0b0b88e3..d31164a2 100644 --- a/.github/workflows/style-check.yml +++ b/.github/workflows/style-check.yml @@ -4,9 +4,11 @@ on: push: branches: - main + - 5.x.x pull_request: branches: - main + - 5.x.x jobs: style-check: From 62887aca07511b59c87db8d89ef277528e63b771 Mon Sep 17 00:00:00 2001 From: Danny van der Sluijs Date: Fri, 12 Dec 2025 09:51:03 +0100 Subject: [PATCH 2/2] docs: Add changelog entry --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9fca36e..0fbbb5ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Changed +- ci: Run workflows against 5.x.x branches ([#859](https://github.com/jsonrainbow/json-schema/pull/859)) ## [6.6.3] - 2025-12-02 ### Changed