From 34ce9083794103f00eef082cd761c1184e6e946b Mon Sep 17 00:00:00 2001 From: Danny van der Sluijs Date: Fri, 10 Oct 2025 14:37:02 +0200 Subject: [PATCH 1/2] refactor: Rename master to main --- .github/workflows/code-cov.yml | 4 ++-- .github/workflows/continuous-integration-32-bits.yml | 4 ++-- .github/workflows/continuous-integration.yml | 4 ++-- .github/workflows/lint.yml | 4 ++-- .github/workflows/phpstan.yml | 4 ++-- .github/workflows/style-check.yml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/code-cov.yml b/.github/workflows/code-cov.yml index 520fbe97..0ba5562d 100644 --- a/.github/workflows/code-cov.yml +++ b/.github/workflows/code-cov.yml @@ -3,10 +3,10 @@ name: "Code Coverage" on: push: branches: - - master + - main pull_request: branches: - - master + - main env: COMPOSER_FLAGS: "--ansi --no-interaction --no-progress --prefer-dist" diff --git a/.github/workflows/continuous-integration-32-bits.yml b/.github/workflows/continuous-integration-32-bits.yml index 7c81766f..4c7d5815 100644 --- a/.github/workflows/continuous-integration-32-bits.yml +++ b/.github/workflows/continuous-integration-32-bits.yml @@ -3,10 +3,10 @@ name: "Continuous Integration - 32-bits" on: push: branches: - - master + - main pull_request: branches: - - master + - main 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 d1f47380..d53ae66a 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -3,10 +3,10 @@ name: "Continuous Integration" on: push: branches: - - master + - main pull_request: branches: - - master + - main env: COMPOSER_FLAGS: "--ansi --no-interaction --no-progress --prefer-dist" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index da26de5c..34a45e95 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -3,10 +3,10 @@ name: "PHP Lint" on: push: branches: - - master + - main pull_request: branches: - - master + - main jobs: lint: diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 40f3cb95..705be926 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -3,10 +3,10 @@ name: "PHPStan" on: push: branches: - - master + - main pull_request: branches: - - master + - main env: COMPOSER_FLAGS: "--ansi --no-interaction --no-progress --prefer-dist" diff --git a/.github/workflows/style-check.yml b/.github/workflows/style-check.yml index 861f7f40..0b0b88e3 100644 --- a/.github/workflows/style-check.yml +++ b/.github/workflows/style-check.yml @@ -3,10 +3,10 @@ name: "Style Check" on: push: branches: - - master + - main pull_request: branches: - - master + - main jobs: style-check: From 65239377ffe21cae8d26a1043f01a1f6ac599517 Mon Sep 17 00:00:00 2001 From: Danny van der Sluijs Date: Fri, 10 Oct 2025 14:38:27 +0200 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 d3ac7862..b79c60c1 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 +- Rename master to main ([#848](https://github.com/jsonrainbow/json-schema/pull/848)) ## [6.6.0] - 2025-10-10 ### Added