Skip to content

Commit

Permalink
Merge branch 'main' into 16977-block-stream-bucket-uploader-metrics
Browse files Browse the repository at this point in the history
  • Loading branch information
MiroslavGatsanoga committed Jan 15, 2025
2 parents 57ac0f6 + 84fb83b commit 84b5ec9
Show file tree
Hide file tree
Showing 243 changed files with 10,476 additions and 6,833 deletions.
44 changes: 22 additions & 22 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
##### Global Protection Rule ######
###################################
# NOTE: This rule is overriden by the more specific rules below. This is the catch-all rule for all files not covered by the more specific rules below.
* @hashgraph/devops-ci @hashgraph/release-engineering-managers
* @hashgraph/platform-ci @hashgraph/release-engineering-managers
#########################
##### Example apps ######
#########################
Expand All @@ -29,10 +29,10 @@
# Hedera Node Deployments - Configuration & Grafana Dashboards
/hedera-node/configuration/** @rbair23 @dalvizu @poulok @netopyr @Nana-EC @SimiHunjan @steven-sheehy @nathanklick
/hedera-node/configuration/dev/** @hashgraph/hedera-services
/hedera-node/infrastructure/** @hashgraph/release-engineering-managers @hashgraph/devops-ci @hashgraph/devops @hashgraph/hedera-services
/hedera-node/infrastructure/** @hashgraph/release-engineering-managers @hashgraph/platform-ci @hashgraph/devops @hashgraph/hedera-services

# Hedera Node Docker Definitions
/hedera-node/docker/ @hashgraph/hedera-services @hashgraph/devops-ci @hashgraph/release-engineering @hashgraph/release-engineering-managers
/hedera-node/docker/ @hashgraph/hedera-services @hashgraph/platform-ci @hashgraph/release-engineering @hashgraph/release-engineering-managers

# Hedera Node Modules
/hedera-node/hapi*/ @hashgraph/hedera-services
Expand Down Expand Up @@ -102,40 +102,40 @@
# NOTE: Must be placed last to ensure enforcement over all other rules

# Protection Rules for Github Configuration Files and Actions Workflows
/.github/ @hashgraph/devops-ci @hashgraph/release-engineering-managers
/.github/workflows/ @hashgraph/devops-ci @hashgraph/devops-ci-committers
/.github/workflows/node-zxf-deploy-integration.yaml @hashgraph/devops-ci @hashgraph/devops-ci-committers @hashgraph/devops
/.github/workflows/node-zxf-deploy-preview.yaml @hashgraph/devops-ci @hashgraph/devops-ci-committers @hashgraph/devops
/.github/ @hashgraph/platform-ci @hashgraph/release-engineering-managers
/.github/workflows/ @hashgraph/platform-ci @hashgraph/platform-ci-committers
/.github/workflows/node-zxf-deploy-integration.yaml @hashgraph/platform-ci @hashgraph/platform-ci-committers @hashgraph/devops
/.github/workflows/node-zxf-deploy-preview.yaml @hashgraph/platform-ci @hashgraph/platform-ci-committers @hashgraph/devops

# Legacy Maven project files
**/pom.xml @hashgraph/devops-ci @hashgraph/devops
**/pom.xml @hashgraph/platform-ci @hashgraph/devops

# Gradle project files and inline plugins
/gradle/ @hashgraph/devops-ci @hashgraph/devops-ci-committers
gradlew @hashgraph/devops-ci @hashgraph/devops-ci-committers
gradlew.bat @hashgraph/devops-ci @hashgraph/devops-ci-committers
**/build-logic/ @hashgraph/devops-ci @hashgraph/devops-ci-committers
**/gradle.* @hashgraph/devops-ci @hashgraph/devops-ci-committers
**/*.gradle.* @hashgraph/devops-ci @hashgraph/devops-ci-committers
/gradle/ @hashgraph/platform-ci @hashgraph/platform-ci-committers
gradlew @hashgraph/platform-ci @hashgraph/platform-ci-committers
gradlew.bat @hashgraph/platform-ci @hashgraph/platform-ci-committers
**/build-logic/ @hashgraph/platform-ci @hashgraph/platform-ci-committers
**/gradle.* @hashgraph/platform-ci @hashgraph/platform-ci-committers
**/*.gradle.* @hashgraph/platform-ci @hashgraph/platform-ci-committers

# Codacy Tool Configurations
/config/ @hashgraph/devops-ci @hashgraph/release-engineering-managers
.remarkrc @hashgraph/devops-ci @hashgraph/release-engineering-managers
/config/ @hashgraph/platform-ci @hashgraph/release-engineering-managers
.remarkrc @hashgraph/platform-ci @hashgraph/release-engineering-managers

# Self-protection for root CODEOWNERS files (this file should not exist and should definitely require approval)
/CODEOWNERS @hashgraph/release-engineering-managers

# Protect the repository root files
/README.md @hashgraph/devops-ci @hashgraph/release-engineering-managers @hashgraph/platform-base @hashgraph/hedera-services @hashgraph/platform-hashgraph
/README.md @hashgraph/platform-ci @hashgraph/release-engineering-managers @hashgraph/platform-base @hashgraph/hedera-services @hashgraph/platform-hashgraph
**/LICENSE @hashgraph/release-engineering-managers

# CodeCov configuration
**/codecov.yml @hashgraph/devops-ci @hashgraph/release-engineering-managers
**/codecov.yml @hashgraph/platform-ci @hashgraph/release-engineering-managers

# Git Ignore definitions
**/.gitignore @hashgraph/devops-ci @hashgraph/release-engineering-managers @hashgraph/platform-base @hashgraph/hedera-services @hashgraph/platform-hashgraph
**/.gitignore.* @hashgraph/devops-ci @hashgraph/release-engineering-managers @hashgraph/platform-base @hashgraph/hedera-services @hashgraph/platform-hashgraph
**/.gitignore @hashgraph/platform-ci @hashgraph/release-engineering-managers @hashgraph/platform-base @hashgraph/hedera-services @hashgraph/platform-hashgraph
**/.gitignore.* @hashgraph/platform-ci @hashgraph/release-engineering-managers @hashgraph/platform-base @hashgraph/hedera-services @hashgraph/platform-hashgraph

# Legacy CircleCI configuration
.circleci.settings.xml @hashgraph/devops-ci @hashgraph/release-engineering-managers
/.circleci/ @hashgraph/devops-ci @hashgraph/release-engineering-managers
.circleci.settings.xml @hashgraph/platform-ci @hashgraph/release-engineering-managers
/.circleci/ @hashgraph/platform-ci @hashgraph/release-engineering-managers
29 changes: 1 addition & 28 deletions .github/workflows/node-flow-build-application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,30 +94,6 @@ jobs:
with:
egress-policy: audit

- name: Configure Workflow Inputs
id: workflow-inputs
env:
REFERENCE: ${{ github.ref }}
AUTHOR: ${{ github.event.head_commit.author.name }}
MESSAGE: ${{ github.event.head_commit.message }}
COMMIT_SHA: ${{ github.sha }}
run: |
# massage the message to remove invalid control characters
MASSAGED_MESSAGE="${MESSAGE//[$'\t\r\n']/' '}"
# Assign github step outputs
echo "input-ref=${REFERENCE}" >> $GITHUB_OUTPUT
echo "input-author=${AUTHOR}" >> $GITHUB_OUTPUT
echo "input-msg=${MASSAGED_MESSAGE}" >> $GITHUB_OUTPUT
echo "input-sha=${COMMIT_SHA}" >> $GITHUB_OUTPUT
# Preview the input values
echo "### Workflow Dispatch Inputs" >> $GITHUB_STEP_SUMMARY
echo "input-ref=${REFERENCE}" >> $GITHUB_STEP_SUMMARY
echo "input-author=${AUTHOR}" >> $GITHUB_STEP_SUMMARY
echo "input-msg=${MASSAGED_MESSAGE}" >> $GITHUB_STEP_SUMMARY
echo "input-sha=${COMMIT_SHA}" >> $GITHUB_STEP_SUMMARY
- name: Trigger ZXF Deploy Production Release
uses: step-security/workflow-dispatch@4d1049025980f72b1327cbfdeecb07fe7a20f577 # v1.2.4
with:
Expand All @@ -126,8 +102,5 @@ jobs:
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 }}",
"author": "${{ steps.workflow-inputs.outputs.input-author }}",
"msg": "${{ steps.workflow-inputs.outputs.input-msg }}",
"sha": "${{ steps.workflow-inputs.outputs.input-sha }}"
"ref": "${{ github.ref }}"
}'
25 changes: 3 additions & 22 deletions .github/workflows/node-flow-deploy-release-artifact.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,6 @@ on:
ref:
required: true
description: "The github branch or tag that triggered the workflow"
author:
required: false
description: "The author of the commit"
default: ""
msg:
required: false
description: "The message on the head commit"
default: ""
sha:
required: false
description: "The commit ID of the commit that triggered the workflow"
default: ""

defaults:
run:
Expand Down Expand Up @@ -181,9 +169,7 @@ jobs:

- name: Check Integration Job State
id: check-integration-job
if: ${{ needs.release-branch.result == 'success' &&
(inputs.author != '' && inputs.msg != '' && inputs.sha != '') &&
!cancelled() }}
if: ${{ needs.release-branch.result == 'success' && !cancelled() }}
env:
GH_TOKEN: ${{ github.token }}
run: |
Expand All @@ -193,20 +179,15 @@ jobs:
echo "enabled=${JOB_ENABLED}" >> $GITHUB_OUTPUT
- name: Trigger ZXF Deploy Integration
if: ${{ needs.release-branch.result == 'success' && steps.check-integration-job.outputs.enabled == 'true' &&
(inputs.author != '' && inputs.msg != '' && inputs.sha != '') &&
!cancelled() }}
if: ${{ needs.release-branch.result == 'success' && steps.check-integration-job.outputs.enabled == 'true' && !cancelled() }}
uses: step-security/workflow-dispatch@4d1049025980f72b1327cbfdeecb07fe7a20f577 # v1.2.4
with:
workflow: .github/workflows/node-zxf-deploy-integration.yaml
repo: hashgraph/hedera-services # ensure we are executing in the hashgraph org
ref: main # ensure we are always using the workflow definition from the main branch
token: ${{ secrets.GH_ACCESS_TOKEN }}
inputs: '{
"ref": "${{ inputs.ref }}",
"author": "${{ inputs.author }}",
"msg": "${{ inputs.msg }}",
"sha": "${{ inputs.sha }}"
"ref": "${{ inputs.ref }}"
}'

update-hedera-protobufs:
Expand Down
50 changes: 25 additions & 25 deletions .github/workflows/node-zxc-build-release-artifact.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,11 @@ jobs:

- name: Gradle Update Version (As Specified)
if: ${{ inputs.version-policy == 'specified' && !cancelled() && !failure() }}
run: ./gradlew versionAsSpecified -PnewVersion=${{ inputs.new-version }} --scan
run: ./gradlew versionAsSpecified -PnewVersion=${{ inputs.new-version }}

- name: Gradle Update Version (Branch Commit)
if: ${{ inputs.version-policy != 'specified' && !cancelled() && !failure() }}
run: ./gradlew versionAsPrefixedCommit -PcommitPrefix=${{ steps.parameters.outputs.commit-prefix }} --scan
run: ./gradlew versionAsPrefixedCommit -PcommitPrefix=${{ steps.parameters.outputs.commit-prefix }}

- name: Compute Final Effective Version
id: effective-version
Expand Down Expand Up @@ -309,10 +309,10 @@ jobs:

- name: Gradle Assemble
id: gradle-build
run: ./gradlew assemble --scan
run: ./gradlew assemble

- name: Gradle Version Summary
run: ./gradlew githubVersionSummary --scan
run: ./gradlew githubVersionSummary

- name: Stage Artifact Build Folder
id: artifact-staging
Expand Down Expand Up @@ -396,28 +396,28 @@ jobs:
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
if: ${{ inputs.dry-run-enabled != true && !cancelled() && !failure() }}
with:
token_format: 'access_token'
token_format: "access_token"
workload_identity_provider: "projects/235822363393/locations/global/workloadIdentityPools/hedera-builds-pool/providers/hedera-builds-gh-actions"
service_account: "[email protected]"

- name: Set Image Registry
id: set-registry
run: |
DOCKER_REGISTRY="gcr.io"
[[ "${{ inputs.version-policy }}" == "branch-commit" ]] && DOCKER_REGISTRY="us-docker.pkg.dev"
echo "docker-registry=${DOCKER_REGISTRY}" >>"${GITHUB_OUTPUT}"
DOCKER_TAG_BASE="gcr.io/hedera-registry"
if [[ "${{ inputs.version-policy }}" == "branch-commit" && "${{ inputs.dry-run-enabled }}" != true ]]; then
DOCKER_TAG_BASE="us-docker.pkg.dev/swirlds-registry/local-node"
elif [[ "${{ inputs.dry-run-enabled }}" == true ]]; then
DOCKER_TAG_BASE="localhost:5000"
fi
DOCKER_REGISTRY="gcr.io"
[[ "${{ inputs.version-policy }}" == "branch-commit" ]] && DOCKER_REGISTRY="us-docker.pkg.dev"
echo "docker-registry=${DOCKER_REGISTRY}" >>"${GITHUB_OUTPUT}"
DOCKER_TAG_BASE="gcr.io/hedera-registry"
if [[ "${{ inputs.version-policy }}" == "branch-commit" && "${{ inputs.dry-run-enabled }}" != true ]]; then
DOCKER_TAG_BASE="us-docker.pkg.dev/swirlds-registry/local-node"
elif [[ "${{ inputs.dry-run-enabled }}" == true ]]; then
DOCKER_TAG_BASE="localhost:5000"
fi
echo "docker-tag-base=${DOCKER_TAG_BASE}" >>"${GITHUB_OUTPUT}"
echo "docker-tag-base=${DOCKER_TAG_BASE}" >>"${GITHUB_OUTPUT}"
- name: Setup QEmu Support
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0

- name: Setup Docker Buildx Support
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
Expand Down Expand Up @@ -474,8 +474,8 @@ jobs:
push: true
platforms: linux/amd64,linux/arm64
build-args: |
IMAGE_TAG=${{ needs.validate.outputs.version }}
IMAGE_PREFIX=${{ steps.set-registry.outputs.docker-tag-base }}/
IMAGE_TAG=${{ needs.validate.outputs.version }}
IMAGE_PREFIX=${{ steps.set-registry.outputs.docker-tag-base }}/
context: hedera-node/infrastructure/docker/containers/local-node/main-network-node
tags: ${{ steps.set-registry.outputs.docker-tag-base }}/main-network-node:${{ needs.validate.outputs.version }}

Expand Down Expand Up @@ -570,7 +570,7 @@ jobs:
id: google-auth
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
with:
token_format: 'access_token'
token_format: "access_token"
workload_identity_provider: "projects/235822363393/locations/global/workloadIdentityPools/hedera-builds-pool/providers/hedera-builds-gh-actions"
service_account: "[email protected]"

Expand Down Expand Up @@ -658,7 +658,7 @@ jobs:
fi
- name: Upload Manifests
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
if: ${{ (steps.gcp.outcome == 'success' || steps.jfrog.outcome == 'success') && !cancelled() && always() }}
with:
name: Production Image Manifests
Expand Down Expand Up @@ -732,10 +732,10 @@ jobs:
key: node-build-version-${{ needs.validate.outputs.version }}-${{ github.sha }}

- name: Gradle Assemble
run: ./gradlew assemble --scan
run: ./gradlew assemble

- name: Gradle Version Summary
run: ./gradlew githubVersionSummary --scan
run: ./gradlew githubVersionSummary

- name: Stage SDK Release Archives
working-directory: platform-sdk
Expand Down Expand Up @@ -814,14 +814,14 @@ jobs:
env:
NEXUS_USERNAME: ${{ secrets.sdk-ossrh-username }}
NEXUS_PASSWORD: ${{ secrets.sdk-ossrh-password }}
run: ./gradlew release${{ inputs.release-profile }} -PpublishingPackageGroup=com.swirlds -Ps01SonatypeHost=true -PpublishSigningEnabled=true --scan --no-configuration-cache
run: ./gradlew release${{ inputs.release-profile }} -PpublishingPackageGroup=com.swirlds -Ps01SonatypeHost=true -PpublishSigningEnabled=true --no-configuration-cache

- name: Gradle Publish Services to ${{ inputs.version-policy == 'specified' && 'Maven Central' || 'Google Artifact Registry' }} (${{ inputs.release-profile }})
if: ${{ inputs.dry-run-enabled != true && inputs.release-profile != 'none' && !cancelled() && !failure() }}
env:
NEXUS_USERNAME: ${{ secrets.svcs-ossrh-username }}
NEXUS_PASSWORD: ${{ secrets.svcs-ossrh-password }}
run: ./gradlew release${{ inputs.release-profile }} -PpublishingPackageGroup=com.hedera.hashgraph -PpublishSigningEnabled=true --scan --no-configuration-cache
run: ./gradlew release${{ inputs.release-profile }} -PpublishingPackageGroup=com.hedera.hashgraph -PpublishSigningEnabled=true --no-configuration-cache

- name: Upload SDK Release Archives
if: ${{ inputs.dry-run-enabled != true && inputs.version-policy == 'specified' && !cancelled() && !failure() }}
Expand Down
Loading

0 comments on commit 84b5ec9

Please sign in to comment.