diff options
| author | tobtoht <tob@featherwallet.org> | 2026-05-05 10:00:26 +0000 |
|---|---|---|
| committer | tobtoht <tob@featherwallet.org> | 2026-05-05 10:00:26 +0000 |
| commit | 8df248d12090cb71c0d2414d5454a41202d512ad (patch) | |
| tree | 7f425f2e4cf536f9d964f3f94c78288ff3b78129 | |
| parent | ffbd7831a5323ccc304b59fe52edaf1e8e9c0f24 (diff) | |
| parent | 36fa29e98e1edde005cbf3cb201bc502a87a4c08 (diff) | |
| download | monzero-gui-8df248d12090cb71c0d2414d5454a41202d512ad.tar.gz monzero-gui-8df248d12090cb71c0d2414d5454a41202d512ad.tar.xz monzero-gui-8df248d12090cb71c0d2414d5454a41202d512ad.zip | |
Merge pull request #4586
36fa29e build: prepare v0.18.5.0 (selsta)
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Dockerfile.windows | 4 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| m--------- | monero | 0 |
4 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b47bf71..c7d56c82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,8 +4,8 @@ project(monero-gui) message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}") set(VERSION_MAJOR "18") -set(VERSION_MINOR "4") -set(VERSION_REVISION "7") +set(VERSION_MINOR "5") +set(VERSION_REVISION "0") 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 98663895..aaf4e4d6 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.6 --depth 1 https://github.com/monero-project/monero && \ +RUN git clone -b v0.18.5.0 --depth 1 https://github.com/monero-project/monero && \ cd monero && \ - git reset --hard dbcc7d212c094bd1a45f7291dbb99a4b4627a96d && \ + git reset --hard 3ca4c30f73fe22d16a46cfba122556437da3618d && \ 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.7`) to build the release binaries. + \* `master` - replace with the desired version tag (e.g. `v0.18.5.0`) 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.7`) to build the release binaries. + \* `master` - replace with the desired version tag (e.g. `v0.18.5.0`) to build the release binaries. 3. Prepare build environment ``` cd monero-gui diff --git a/monero b/monero -Subproject dbcc7d212c094bd1a45f7291dbb99a4b4627a96 +Subproject 3ca4c30f73fe22d16a46cfba122556437da3618 |