diff options
| author | tobtoht <tob@featherwallet.org> | 2026-07-03 08:58:30 +0000 |
|---|---|---|
| committer | tobtoht <tob@featherwallet.org> | 2026-07-03 08:58:30 +0000 |
| commit | 81f33c7e00bf183823909a02e6d96ce11e41adce (patch) | |
| tree | aff26569295b84991aa67171ede26286b9a64998 | |
| parent | 6d0b21585e89047abe9918f9ea8ae5ba20f1015f (diff) | |
| parent | 9c76f099cfaacda11fcb2e7b46473210ee86c33e (diff) | |
| download | monzero-gui-81f33c7e00bf183823909a02e6d96ce11e41adce.tar.gz monzero-gui-81f33c7e00bf183823909a02e6d96ce11e41adce.tar.xz monzero-gui-81f33c7e00bf183823909a02e6d96ce11e41adce.zip | |
Merge pull request #4626
9c76f09 build: prepare v0.18.5.1 (selsta)
ACKs: plowsof
| -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 c7d56c82..6c8efa13 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 "5") -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 8bc4e2cd..f51bd9d6 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.5.0 --depth 1 https://github.com/monero-project/monero && \ +RUN git clone -b v0.18.5.1 --depth 1 https://github.com/monero-project/monero && \ cd monero && \ - git reset --hard 3ca4c30f73fe22d16a46cfba122556437da3618d && \ + git reset --hard 4f92268d7c16741cfb41e5bbe2aa46cc260a9ea5 && \ 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.5.0`) to build the release binaries. + \* `master` - replace with the desired version tag (e.g. `v0.18.5.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.5.0`) to build the release binaries. + \* `master` - replace with the desired version tag (e.g. `v0.18.5.1`) to build the release binaries. 3. Prepare build environment ``` cd monero-gui diff --git a/monero b/monero -Subproject 3ca4c30f73fe22d16a46cfba122556437da3618 +Subproject 4f92268d7c16741cfb41e5bbe2aa46cc260a9ea |