Merge pull request #4491

16da754 build: prepare v0.18.4.2 (selsta)

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")

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

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.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