diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2025-08-24 22:34:18 -0400 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2025-08-24 22:34:18 -0400 |
| commit | c89f8eca9155473105519c37e706753214534e2a (patch) | |
| tree | d66fbcd1c0478d63769f660207904514d9fad3da | |
| parent | 346d962837313f9ecd849a5c25ab6784ab4154b2 (diff) | |
| parent | 16da754c79fa57617d73980f3fff61a2c3e57b5a (diff) | |
| download | monzero-gui-c89f8eca9155473105519c37e706753214534e2a.tar.gz monzero-gui-c89f8eca9155473105519c37e706753214534e2a.tar.xz monzero-gui-c89f8eca9155473105519c37e706753214534e2a.zip | |
Merge pull request #4491
16da754 build: prepare v0.18.4.2 (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 e0d40cff..05759d17 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 "1") +set(VERSION_REVISION "2") 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 c75a58c6..fe13535d 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.1 --depth 1 https://github.com/monero-project/monero && \ +RUN git clone -b v0.18.4.2 --depth 1 https://github.com/monero-project/monero && \ cd monero && \ - git reset --hard ec870e50706a29768a65f597155ed5c7ad7e6326 && \ + git reset --hard d87edf57fcc4bc2279ad9d8a1db093805e6becd7 && \ 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.1`) to build the release binaries. + \* `master` - replace with the desired version tag (e.g. `v0.18.4.2`) 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.1`) to build the release binaries. + \* `master` - replace with the desired version tag (e.g. `v0.18.4.2`) to build the release binaries. 3. Prepare build environment ``` cd monero-gui diff --git a/monero b/monero -Subproject ec870e50706a29768a65f597155ed5c7ad7e632 +Subproject d87edf57fcc4bc2279ad9d8a1db093805e6becd |