diff options
| author | tobtoht <tob@featherwallet.org> | 2025-07-17 14:42:45 +0000 |
|---|---|---|
| committer | tobtoht <tob@featherwallet.org> | 2025-07-17 14:42:45 +0000 |
| commit | 0149f946b9521b791c9fc480669b46395bfbd04e (patch) | |
| tree | 7e480a8d3193b4886397f83282cc1bed0b4c5d8b | |
| parent | e3620f39dc7566f28f953e9a139713b7de5d2b0f (diff) | |
| parent | 1afc8e69c6076279de4c277f09b4fa0c51ad8ec2 (diff) | |
| download | monzero-gui-0149f946b9521b791c9fc480669b46395bfbd04e.tar.gz monzero-gui-0149f946b9521b791c9fc480669b46395bfbd04e.tar.xz monzero-gui-0149f946b9521b791c9fc480669b46395bfbd04e.zip | |
Merge pull request #4471
1afc8e6 build: prepare v0.18.4.1 (selsta)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Dockerfile.windows | 4 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| m--------- | monero | 0 |
4 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2238919e..e0d40cff 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 @@ -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 -Subproject f1311d4237404ab7da76241dbf10e92a65132cc +Subproject ec870e50706a29768a65f597155ed5c7ad7e632 |