Merge pull request

3ae32613 build: prepare v0.18.4.0 (selsta)
This commit is contained in:
tobtoht 2025-03-30 15:39:14 +00:00
commit 35bc27a3a8
No known key found for this signature in database
GPG key ID: E45B10DD027D2472
4 changed files with 7 additions and 7 deletions

View file

@ -4,8 +4,8 @@ project(monero-gui)
message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
set(VERSION_MAJOR "18")
set(VERSION_MINOR "3")
set(VERSION_REVISION "4")
set(VERSION_MINOR "4")
set(VERSION_REVISION "0")
set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")
option(STATIC "Link libraries statically, requires static Qt")

View file

@ -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.2.0 --depth 1 https://github.com/monero-project/monero && \
RUN git clone -b v0.18.4.0 --depth 1 https://github.com/monero-project/monero && \
cd monero && \
git reset --hard 99be9a044f3854f339548e2d99c539c18d7b1b01 && \
git reset --hard f1311d4237404ab7da76241dbf10e92a65132cc4 && \
cp -a contrib/depends / && \
cd .. && \
rm -rf monero

View file

@ -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.3.4`) to build the release binaries.
\* `master` - replace with the desired version tag (e.g. `v0.18.4.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.3.4`) to build the release binaries.
\* `master` - replace with the desired version tag (e.g. `v0.18.4.0`) to build the release binaries.
3. Prepare build environment
```
cd monero-gui

2
monero

@ -1 +1 @@
Subproject commit b089f9ee69924882c5d14dd1a6991deb05d9d1cd
Subproject commit f1311d4237404ab7da76241dbf10e92a65132cc4