From d568a53812aa4b9d22a1d6a1768515f8e5a23a69 Mon Sep 17 00:00:00 2001
From: Yurii Kovalchuk <yurii.kovalchuk@fortegrp.com>
Date: Thu, 3 Oct 2024 19:42:21 +0300
Subject: [PATCH] ANON-192 - Bump version, remove dev branch

---
 .github/workflows/build-packages.yml       | 2 --
 .github/workflows/build.yml                | 1 -
 .github/workflows/deploy-grafana.yml       | 3 +--
 .github/workflows/dev-build-and-deploy.yml | 2 +-
 configure.ac                               | 4 ++--
 contrib/win32build/anon-mingw.nsi.in       | 2 +-
 6 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index 5765253a78..66cf210bed 100644
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -7,11 +7,9 @@ on:
       - '*beta*'
     branches:
       - main
-      - development
   pull_request:
     branches:
       - main
-      - development
 
 env:
   DEBIAN_FRONTEND: noninteractive
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5a0415d63a..099aa319f2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,6 @@ name: Build Docker Images
 on:
   pull_request:
     branches:
-      - development
       - main
   workflow_dispatch:
 
diff --git a/.github/workflows/deploy-grafana.yml b/.github/workflows/deploy-grafana.yml
index bb6e14260a..10393c1691 100644
--- a/.github/workflows/deploy-grafana.yml
+++ b/.github/workflows/deploy-grafana.yml
@@ -2,7 +2,6 @@ name: Grafana Deploy
 
 on:
   workflow_dispatch:
-    
 
 env:
   hc-url: https://95.217.159.249:13000/
@@ -16,7 +15,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Deploy new version 
+      - name: Deploy new version
         uses: ./.github/actions/deploy
         with:
           image-tag: "none"
diff --git a/.github/workflows/dev-build-and-deploy.yml b/.github/workflows/dev-build-and-deploy.yml
index ccc5410680..9c3fbcf901 100644
--- a/.github/workflows/dev-build-and-deploy.yml
+++ b/.github/workflows/dev-build-and-deploy.yml
@@ -3,7 +3,7 @@ name: Dev Build Image and Deploy
 on:
   push:
     branches:
-      - development
+      - main
   workflow_dispatch:
 
 env:
diff --git a/configure.ac b/configure.ac
index dcca2124b7..8fba693599 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([anon],[0.4.9.7-git])
+AC_INIT([anon],[0.4.9.8-git])
 AC_CONFIG_SRCDIR([src/app/main/anon_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], [Flags passed to config
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2024-08-01"], # for 0.4.9.7-git
+AC_DEFINE(APPROX_RELEASE_DATE, ["2024-10-03"], # for 0.4.9.8-git
           [Approximate date when this software was released. (Updated when the version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/anon-mingw.nsi.in b/contrib/win32build/anon-mingw.nsi.in
index 29932d7571..eb89939420 100644
--- a/contrib/win32build/anon-mingw.nsi.in
+++ b/contrib/win32build/anon-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.9.7-git"
+!define VERSION "0.4.9.8-git"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/"
 !define LICENSE "LICENSE"