Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Change develop to main for a main branch #16812

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/flow-artifact-determinism.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ on:
push:
branches:
- develop
- main
- 'release/**'
tags:
- 'v*.*.*'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/node-flow-build-application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
with:
workflow: .github/workflows/node-flow-deploy-release-artifact.yaml
repo: hashgraph/hedera-services # ensure we are executing in the hashgraph org
ref: develop # ensure we are always using the workflow definition from the develop branch
ref: main # ensure we are always using the workflow definition from the main branch
token: ${{ secrets.GH_ACCESS_TOKEN }}
inputs: '{
"ref": "${{ steps.workflow-inputs.outputs.input-ref }}",
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/node-flow-deploy-release-artifact.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: '0'
ref: develop
ref: main
token: ${{ secrets.GH_ACCESS_TOKEN }}

- name: Trigger ZXF Prepare Extended Test Suite
Expand All @@ -159,7 +159,7 @@ jobs:
with:
workflow: .github/workflows/zxf-prepare-extended-test-suite.yaml
repo: hashgraph/hedera-services # ensure we are executing in the hashgraph org
ref: develop # ensure we are always using the workflow definition from the develop branch
ref: main # ensure we are always using the workflow definition from the main branch
token: ${{ secrets.GH_ACCESS_TOKEN }}
inputs: '{ "ref": "${{ inputs.ref }}" }'

Expand All @@ -171,7 +171,7 @@ jobs:
with:
workflow: .github/workflows/node-zxf-deploy-integration.yaml
repo: hashgraph/hedera-services # ensure we are executing in the hashgraph org
ref: develop # ensure we are always using the workflow definition from the develop branch
ref: main # ensure we are always using the workflow definition from the main branch
token: ${{ secrets.GH_ACCESS_TOKEN }}
inputs: '{
"ref": "${{ inputs.ref }}",
Expand All @@ -195,7 +195,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
token: ${{ secrets.GH_ACCESS_TOKEN }}
ref: develop
ref: main
fetch-depth: '0'

- name: Checkout Hedera Protobufs Code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/node-zxf-snyk-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ name: "ZXF: Snyk Monitor"
on:
push:
branches:
- develop
- main
workflow_dispatch:

permissions:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/zxc-jrs-regression.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -485,8 +485,8 @@ jobs:
fi

if [[ -n "${HEDERA_TESTS_ENABLED}" && "${HEDERA_TESTS_ENABLED}" = true ]]; then
# Override for the develop branch
if [[ "${SLACK_BRANCH}" != "develop" ]]; then
# Override for the main branch
if [[ "${SLACK_BRANCH}" != "main" ]]; then
SLACK_SUMMARY="hedera-gcp-${SLACK_BRANCH}-summary"
SLACK_RESULTS="hedera-gcp-${SLACK_BRANCH}-regression"
else
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/zxcron-extended-test-suite.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: '0'
ref: develop
ref: main
token: ${{ secrets.GH_ACCESS_TOKEN }}

# Check if the xts-candidate tag exists
# the command git branch --contains xts-tag-commit | grep --quiet <default branch>
# will return an exit code of 1 if the tagged commit is not found on the develop
# will return an exit code of 1 if the tagged commit is not found on the main
# branch.
- name: Check for tags
id: check-tags-exist
Expand Down Expand Up @@ -93,19 +93,19 @@ jobs:
gh run cancel ${{ github.run_id }}
fi

# Check if the tag exists on the develop branch
# Check if the tag exists on the main branch
set +e
git branch --contains "${XTS_COMMIT}" | grep --quiet develop >/dev/null 2>&1
BRANCH_ON_DEVELOP="${?}"
git branch --contains "${XTS_COMMIT}" | grep --quiet main >/dev/null 2>&1
BRANCH_ON_MAIN="${?}"
set -e

# Get commit author
AUTHOR_NAME=$(git log -1 --format='%an' "${XTS_COMMIT}")
AUTHOR_EMAIL=$(git log -1 --format='%ae' "${XTS_COMMIT}")

# If the tag exists on the Develop Branch set the output variables as appropriate
# If the tag exists on the main Branch set the output variables as appropriate
# Otherwise cancel out
if [[ "${BRANCH_ON_DEVELOP}" -eq 0 ]]; then
if [[ "${BRANCH_ON_MAIN}" -eq 0 ]]; then
echo "xts-tag-exists=true" >> $GITHUB_OUTPUT
echo "xts-tag-commit=${XTS_COMMIT}" >> $GITHUB_OUTPUT
echo "xts-tag-commit-author=${AUTHOR_NAME} <${AUTHOR_EMAIL}>" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -259,7 +259,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: '0'
ref: develop
ref: main
token: ${{ secrets.GH_ACCESS_TOKEN }}

- name: Collect run logs in a log file
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/zxcron-promote-build-candidate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: '0'
ref: develop
ref: main
token: ${{ secrets.GH_ACCESS_TOKEN }}

- name: Find Build Candidates
Expand All @@ -74,8 +74,8 @@ jobs:
gh run cancel ${{ github.run_id }}
fi

# Verify the commit is on develop and continue
if git branch --contains "${CANDIDATE_COMMIT}" | grep --quiet develop >/dev/null 2>&1; then
# Verify the commit is on main and continue
if git branch --contains "${CANDIDATE_COMMIT}" | grep --quiet main >/dev/null 2>&1; then
git push --delete origin $(git tag --list "${TAG_PATTERN}")
git tag --delete $(git tag --list "${TAG_PATTERN}")
echo "build-candidate-exists=true" >> "${GITHUB_OUTPUT}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zxf-collect-workflow-logs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: '0'
ref: develop
ref: main
token: ${{ secrets.GH_ACCESS_TOKEN }}

- name: Get run logs
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/zxf-prepare-extended-test-suite.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,18 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: '0'
ref: 'develop'
ref: 'main'
token: ${{ secrets.GH_ACCESS_TOKEN }}

- name: Validate Input Ref
id: validate-input
env:
COMMIT_ID: ${{ inputs.ref }}
run: |
if git merge-base --is-ancestor "${COMMIT_ID}" develop >/dev/null 2>&1; then
if git merge-base --is-ancestor "${COMMIT_ID}" main >/dev/null 2>&1; then
echo "commit_on_dev=true" >> $GITHUB_OUTPUT
else
echo "::error title=Branch Alignment::The provided commit (${COMMIT_ID}) is not present on the develop branch."
echo "::error title=Branch Alignment::The provided commit (${COMMIT_ID}) is not present on the main branch."
exit 1
fi

Expand Down
2 changes: 1 addition & 1 deletion docs/branch-naming-conventions.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ branches.

**Default Branches**

The default branch for a repository will be `develop` as per the branching workflow.
The default branch for a repository will be `main` as per the branching workflow.

### Branch to Issue Relationship

Expand Down
8 changes: 4 additions & 4 deletions docs/continuous-integration-testing-overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ two major components of CITR: MATS and XTS.
MATS is the Minimal Acceptable Test Suite; this suite of tests is run against every pull request (PR) that is opened in
the `hashgraph/hedera-services` repository.

XTS is the eXtended Test Suite; this suite of tests is run against the latest commit on the develop branch every three
XTS is the eXtended Test Suite; this suite of tests is run against the latest commit on the main branch every three
hours (provided there is a new commit to run against).

MATS tests are inclusive of a series of unit tests and performance tests that must be executed against a PR branch prior
to merging into develop. The MATS tests are intended to complete within a 30-minute time window to provide developers
to merging into main. The MATS tests are intended to complete within a 30-minute time window to provide developers
with valuable insight of the impact of new code on the default branch.

XTS tests are run against the default branch once every three hours. These cover test cases that are unable to complete
Expand All @@ -38,14 +38,14 @@ There is an additional workflow: `ZXF: Extended Test Suite - Dry Run` which is a
`hashgraph/hedera-services` repository.

The XTS Dry-Run workflow runs a provided commit on any branch through the same XTS tests that would be run against the
latest on develop every three hours. This workflow is run with a manual trigger and will execute in parallel to any
latest on main every three hours. This workflow is run with a manual trigger and will execute in parallel to any
other actions ongoing in the `hashgraph/hedera-services` repository.

A developer can manually trigger a run using the parameters in the web UI:

```text
Use Workflow From
Branch: develop # this should always be `develop`
Branch: main # this should always be `main`
The commit sha to check out
<your current commit hash>
The branch name, for JRS Panel output
Expand Down
4 changes: 2 additions & 2 deletions docs/glossary.md
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,9 @@ This file contains the address book to use when starting from genesis.
**Congestion Pricing**: A mechanism designed to manage network congestion by dynamically adjusting
transaction fees based on network demand. The primary goal of congestion pricing is to discourage
excessive network usage during peak times. Refer to
[Congestion Pricing](https://github.com/hashgraph/hedera-services/blob/develop/hedera-node/docs/fees/automated-congestion-pricing.md)
[Congestion Pricing](https://github.com/hashgraph/hedera-services/blob/main/hedera-node/docs/fees/automated-congestion-pricing.md)
and
[Fees](https://github.com/hashgraph/hedera-services/blob/develop/hedera-node/docs/design/app/fees.md).
[Fees](https://github.com/hashgraph/hedera-services/blob/main/hedera-node/docs/design/app/fees.md).

## Consensus Time

Expand Down
2 changes: 2 additions & 0 deletions docs/maintainers-guide.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# THIS FILE SHOULD BE EDITED BEFORE MIGRATING FROM DEVELOP TO MAIN, BUT I'M NOT SURE EXACTLY HOW

# Maintainers Guide

This document outlines the process and keynotes for the core maintainers of this repository .
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spotless {
isEnforceCheck = false

// optional: limit format enforcement to just the files changed by this feature branch
ratchetFrom("origin/develop")
ratchetFrom("origin/main")

format("misc") {
// define the files to apply `misc` to
Expand Down
30 changes: 21 additions & 9 deletions hedera-node/configuration/README.md
Original file line number Diff line number Diff line change
@@ -1,57 +1,69 @@
# Services configuration

The child folders in this directory hold configuration
for various environments, for use with the **upcoming release of Services**.
Each configuration file is described in a small sub-section below.
for various environments, for use with the **upcoming release of Services**.
Each configuration file is described in a small sub-section below.

All deployment paths are given relative to the top-level directory
containing the deployed JAR (in DevOps-managed environments, this
is _/opt/hgcapp/services-hedera/HapiApp2.0_.) If no deployment
All deployment paths are given relative to the top-level directory
containing the deployed JAR (in DevOps-managed environments, this
is _/opt/hgcapp/services-hedera/HapiApp2.0_.) If no deployment
path is given, the file belongs in the top-level directory with the JAR.

## bootstrap.properties

* Deployed as _data/config/bootstrap.properties_
* Normally used with networks **not** starting from a saved state
* Contains overrides used at network startup
- For example, more permissive bootstrap throttles

## application.properties

* Deployed as _data/config/application.properties_
* Genesis contents of file `0.0.121`
- :information_desk_person: &nbsp; Only relevant for networks **not** starting from a saved state
* Genesis contents of file `0.0.121`
- :information_desk_person: &nbsp; Only relevant for networks **not** starting from a saved state

## optional-upgrade/application.properties

* May be used, post-upgrade, as input to a yahcli `sysfiles upload properties` command at the discretion of DevOps

## upgrade/application.properties

* If present, should be used, post-upgrade, as input to a yahcli `sysfiles upload properties` command

## api-permission.properties

* Deployed as _data/config/api-permission.properties_
* Genesis contents of file `0.0.122`
- :information_desk_person: &nbsp; Only relevant for networks **not** starting from a saved state
* Genesis contents of file `0.0.122`
- :information_desk_person: &nbsp; Only relevant for networks **not** starting from a saved state

## optional-upgrade/api-permission.properties

* May be used, post-upgrade, as input to a yahcli `sysfiles upload permissions` command at the discretion of DevOps

## upgrade/api-permission.properties

* If present, should be used, post-upgrade, as input to a yahcli `sysfiles upload permissions` command

## node.properties

* Deployed as _data/config/node.properties_
* Contains overrides of node-level configuration
- For example, more permissive Netty HTTP/2 settings

## upgrade/throttles.json

* If specified, this file serves as the sole input for the `yahcli sysfiles upload throttles` command post-upgrade, replacing any existing throttles with its contents. In its absence, the default is sourced from `:/hedera-node/hedera-file-service-impl/src/main/resources/genesis/throttles.json`.

## javaOptions

* Script to start `HGCApp` with all needed options

## log4j2.xml

* Services logging configuration

## settings.txt

* Platform configuration
* Performance-sensitive settings include:
- `throttleTransactionQueueSize`
Expand Down
2 changes: 1 addition & 1 deletion hedera-node/docker/README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
This folder contains file that are used to start the services as docker containers.
All docker workflows are defined with a corresponding gradle task. No script or file in this folder should be called 'by hand'.
All docker workflows are defined with a corresponding gradle task. No script or file in this folder should be called 'by hand'.
Loading
Loading