From 1afc8e69c6076279de4c277f09b4fa0c51ad8ec2 Mon Sep 17 00:00:00 2001 From: selsta Date: Thu, 17 Jul 2025 01:22:44 +0200 Subject: [PATCH] build: prepare v0.18.4.1 --- CMakeLists.txt | 2 +- Dockerfile.windows | 4 ++-- README.md | 4 ++-- monero | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 892859a3..f8fa66e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}") set(VERSION_MAJOR "18") set(VERSION_MINOR "4") -set(VERSION_REVISION "0") +set(VERSION_REVISION "1") set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}") option(STATIC "Link libraries statically, requires static Qt") diff --git a/Dockerfile.windows b/Dockerfile.windows index 906fd07e..c75a58c6 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -12,9 +12,9 @@ RUN apt update && \ RUN update-alternatives --set x86_64-w64-mingw32-g++ $(which x86_64-w64-mingw32-g++-posix) && \ update-alternatives --set x86_64-w64-mingw32-gcc $(which x86_64-w64-mingw32-gcc-posix) -RUN git clone -b v0.18.4.0 --depth 1 https://github.com/monero-project/monero && \ +RUN git clone -b v0.18.4.1 --depth 1 https://github.com/monero-project/monero && \ cd monero && \ - git reset --hard f1311d4237404ab7da76241dbf10e92a65132cc4 && \ + git reset --hard ec870e50706a29768a65f597155ed5c7ad7e6326 && \ cp -a contrib/depends / && \ cd .. && \ rm -rf monero diff --git a/README.md b/README.md index 8df13093..097a5c2c 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ Packaging for your favorite distribution would be a welcome contribution! ``` git clone --branch master --recursive https://github.com/monero-project/monero-gui.git ``` - \* `master` - replace with the desired version tag (e.g. `v0.18.4.0`) to build the release binaries. + \* `master` - replace with the desired version tag (e.g. `v0.18.4.1`) to build the release binaries. 3. Prepare build environment ``` cd monero-gui @@ -128,7 +128,7 @@ Packaging for your favorite distribution would be a welcome contribution! ``` git clone --branch master --recursive https://github.com/monero-project/monero-gui.git ``` - \* `master` - replace with the desired version tag (e.g. `v0.18.4.0`) to build the release binaries. + \* `master` - replace with the desired version tag (e.g. `v0.18.4.1`) to build the release binaries. 3. Prepare build environment ``` cd monero-gui diff --git a/monero b/monero index f1311d42..ec870e50 160000 --- a/monero +++ b/monero @@ -1 +1 @@ -Subproject commit f1311d4237404ab7da76241dbf10e92a65132cc4 +Subproject commit ec870e50706a29768a65f597155ed5c7ad7e6326