From 1c9e207c65e4cec47e68a3eee32ca569a5d714d6 Mon Sep 17 00:00:00 2001
From: blxdyx <125243069+blxdyx@users.noreply.github.com>
Date: Tue, 7 May 2024 14:59:28 +0800
Subject: [PATCH] bump version and branch rename (#385)

---
 .github/workflows/check.yml                              | 2 +-
 .github/workflows/ci.yml                                 | 8 +++-----
 .github/workflows/coverage.yml                           | 2 +-
 .github/workflows/qa-clean-exit-block-downloading.yml    | 2 +-
 .github/workflows/qa-clean-exit-snapshot-downloading.yml | 4 ++--
 .github/workflows/test-integration.yml                   | 3 +--
 Makefile                                                 | 2 +-
 params/version.go                                        | 2 +-
 8 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 71726222954..743e8c0cae6 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -3,7 +3,7 @@ name: Check
 on:
   push:
     branches:
-      - devel
+      - main
       - devel_1.2.0
   workflow_dispatch:
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d7821db225b..95ac6fa4a82 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,15 +2,13 @@ name: CI
 on:
   push:
     branches:
-      - devel
-      - alpha
+      - main
       - devel_1.2.0
       - 'release/**'
   pull_request:
     branches:
       - devel_1.2.0
-      - devel
-      - alpha
+      - main
       - 'release/**'
     types:
       - opened
@@ -113,7 +111,7 @@ jobs:
 
   docker-build-check:
     # don't run this on devel - the PR must have run it to be merged and it misleads that this pushes the docker image
-    if: (${{ github.event_name == 'push' || !github.event.pull_request.draft }}) && ${{ github.ref != 'refs/heads/devel' }}
+    if: (${{ github.event_name == 'push' || !github.event.pull_request.draft }}) && ${{ github.ref != 'refs/heads/main' }}
     runs-on: ubuntu-22.04
 
     steps:
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index cf45fb46110..f3cfdf07162 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -2,7 +2,7 @@ name: Coverage
 on:
   push:
     branches:
-      - devel
+      - main
       - devel_1.2.0
 
 jobs:
diff --git a/.github/workflows/qa-clean-exit-block-downloading.yml b/.github/workflows/qa-clean-exit-block-downloading.yml
index a6de0505dd8..1df09bfa15e 100644
--- a/.github/workflows/qa-clean-exit-block-downloading.yml
+++ b/.github/workflows/qa-clean-exit-block-downloading.yml
@@ -6,7 +6,7 @@ on:
       - 'release/**'
   pull_request:
     branches:
-      - devel
+      - main
       - 'release/**'
     types:
       - ready_for_review
diff --git a/.github/workflows/qa-clean-exit-snapshot-downloading.yml b/.github/workflows/qa-clean-exit-snapshot-downloading.yml
index 2a3999bc016..651ea870b57 100644
--- a/.github/workflows/qa-clean-exit-snapshot-downloading.yml
+++ b/.github/workflows/qa-clean-exit-snapshot-downloading.yml
@@ -3,11 +3,11 @@ name: QA - Clean exit (snapshot downloading)
 on:
   push:
     branches:
-      - devel
+      - main
       - 'release/**'
   pull_request:
     branches:
-      - devel
+      - main
       - 'release/**'
     types:
       - ready_for_review
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
index a5d5835bfb5..03d95f60ceb 100644
--- a/.github/workflows/test-integration.yml
+++ b/.github/workflows/test-integration.yml
@@ -2,8 +2,7 @@ name: Integration tests
 on:
   push:
     branches:
-      - devel
-      - alpha
+      - main
       - 'release/**'
   schedule:
     - cron: '20 16 * * *' # daily at 16:20 UTC
diff --git a/Makefile b/Makefile
index 52111c4e377..006d45bb1c1 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ DOCKER_TAG ?= thorax/erigon:latest
 # Pipe error below to /dev/null since Makefile structure kind of expects
 # Go to be available, but with docker it's not strictly necessary
 CGO_CFLAGS := $(shell $(GO) env CGO_CFLAGS 2>/dev/null) # don't lose default
-CGO_CFLAGS += -DMDBX_FORCE_ASSERTIONS=0 # Enable MDBX's asserts by default in 'devel' branch and disable in releases
+CGO_CFLAGS += -DMDBX_FORCE_ASSERTIONS=0 # Enable MDBX's asserts by default in 'main' branch and disable in releases
 #CGO_CFLAGS += -DMDBX_DISABLE_VALIDATION=1 # This feature is not ready yet
 #CGO_CFLAGS += -DMDBX_ENABLE_PROFGC=0 # Disabled by default, but may be useful for performance debugging
 #CGO_CFLAGS += -DMDBX_ENABLE_PGOP_STAT=0 # Disabled by default, but may be useful for performance debugging
diff --git a/params/version.go b/params/version.go
index 6bebf5e3c5c..c9989f4089e 100644
--- a/params/version.go
+++ b/params/version.go
@@ -33,7 +33,7 @@ var (
 const (
 	VersionMajor       = 1     // Major version component of the current release
 	VersionMinor       = 2     // Minor version component of the current release
-	VersionMicro       = 6     // Patch version component of the current release
+	VersionMicro       = 7     // Patch version component of the current release
 	VersionModifier    = "dev" // Modifier component of the current release
 	VersionKeyCreated  = "ErigonVersionCreated"
 	VersionKeyFinished = "ErigonVersionFinished"