From 1f4a7038e8075f4161fa0c435cae8be68cf2055e Mon Sep 17 00:00:00 2001 From: TaprootFreak <142087526+TaprootFreak@users.noreply.github.com> Date: Fri, 9 Jan 2026 20:16:11 +0100 Subject: [PATCH 1/2] chore: rename master branch references to main Update all workflow files to use 'main' instead of 'master': - api-prd.yaml: trigger on main branch - api-pr.yaml: run PR checks for main branch - codeql.yml: scan main branch - auto-release-pr.yaml: create release PRs to main --- .github/workflows/api-pr.yaml | 2 +- .github/workflows/api-prd.yaml | 2 +- .github/workflows/auto-release-pr.yaml | 16 ++++++++-------- .github/workflows/codeql.yml | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/api-pr.yaml b/.github/workflows/api-pr.yaml index e560e4c469..fedaa8712e 100644 --- a/.github/workflows/api-pr.yaml +++ b/.github/workflows/api-pr.yaml @@ -3,7 +3,7 @@ name: API PR CI on: pull_request: branches: - - master + - main - develop workflow_dispatch: diff --git a/.github/workflows/api-prd.yaml b/.github/workflows/api-prd.yaml index 336945acdd..b65407a89e 100644 --- a/.github/workflows/api-prd.yaml +++ b/.github/workflows/api-prd.yaml @@ -2,7 +2,7 @@ name: API PRD CI/CD on: push: - branches: [master] + branches: [main] workflow_dispatch: permissions: diff --git a/.github/workflows/auto-release-pr.yaml b/.github/workflows/auto-release-pr.yaml index 710cb56df6..cbb705b6d7 100644 --- a/.github/workflows/auto-release-pr.yaml +++ b/.github/workflows/auto-release-pr.yaml @@ -23,15 +23,15 @@ jobs: with: fetch-depth: 0 - - name: Fetch master branch - run: git fetch origin master + - name: Fetch main branch + run: git fetch origin main - name: Check for existing PR id: check-pr run: | - PR_COUNT=$(gh pr list --base master --head develop --state open --json number --jq 'length') + PR_COUNT=$(gh pr list --base main --head develop --state open --json number --jq 'length') echo "pr_exists=$([[ $PR_COUNT -gt 0 ]] && echo 'true' || echo 'false')" >> $GITHUB_OUTPUT - echo "::notice::Open PRs from develop to master: $PR_COUNT" + echo "::notice::Open PRs from develop to main: $PR_COUNT" env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -39,10 +39,10 @@ jobs: id: check-diff if: steps.check-pr.outputs.pr_exists == 'false' run: | - DIFF_COUNT=$(git rev-list --count origin/master..origin/develop) + DIFF_COUNT=$(git rev-list --count origin/main..origin/develop) echo "has_changes=$([[ $DIFF_COUNT -gt 0 ]] && echo 'true' || echo 'false')" >> $GITHUB_OUTPUT echo "commit_count=$DIFF_COUNT" >> $GITHUB_OUTPUT - echo "::notice::Commits ahead of master: $DIFF_COUNT" + echo "::notice::Commits ahead of main: $DIFF_COUNT" - name: Create Release PR if: steps.check-pr.outputs.pr_exists == 'false' && steps.check-diff.outputs.has_changes == 'true' @@ -64,7 +64,7 @@ jobs: > /tmp/pr-body.md gh pr create \ - --base master \ + --base main \ --head develop \ - --title "Release: develop -> master" \ + --title "Release: develop -> main" \ --body-file /tmp/pr-body.md diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 5ae46ca11d..921384d6b7 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -2,9 +2,9 @@ name: "CodeQL Advanced" on: push: - branches: [ "develop", "master" ] + branches: [ "develop", "main" ] pull_request: - branches: [ "develop", "master" ] + branches: [ "develop", "main" ] jobs: analyze: From af52a4055fd1e5936daf3c787a9ceb23f88ef67f Mon Sep 17 00:00:00 2001 From: TaprootFreak <142087526+TaprootFreak@users.noreply.github.com> Date: Fri, 9 Jan 2026 20:22:25 +0100 Subject: [PATCH 2/2] docs: fix CitreaScan branch reference (master -> main) --- infrastructure/citrea/citreascan/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/citrea/citreascan/README.md b/infrastructure/citrea/citreascan/README.md index 1eca472986..caecbbbd13 100644 --- a/infrastructure/citrea/citreascan/README.md +++ b/infrastructure/citrea/citreascan/README.md @@ -26,7 +26,7 @@ 1. Create the file `docker-compose-blockscout-citrea-testnet.frontend.env` in `/home/{user}` 1. Copy the content of the github repo file `https://github.com/CitreaScan/frontend/blob/develop/.env.dev` in `docker-compose-blockscout-citrea-testnet.frontend.env` -The `docker-compose-blockscout-citrea-testnet.backend.env` and `docker-compose-blockscout-citrea-testnet.frontend.env` files are also located in the corresponding github repos. They will be overwritten by github workflows in case of changes in the `develop` or in the `master` branch. +The `docker-compose-blockscout-citrea-testnet.backend.env` and `docker-compose-blockscout-citrea-testnet.frontend.env` files are also located in the corresponding github repos. They will be overwritten by github workflows in case of changes in the `develop` or in the `main` branch. # Start Docker Containers