Merge pull request #4120

a50491d build: prepare v0.18.2.0 (selsta)
This commit is contained in:
luigi1111 2023-02-25 13:56:09 -05:00
commit 6ec9e24f2f
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
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 "1")
set(VERSION_REVISION "2")
set(VERSION_MINOR "2")
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.1.0 --depth 1 https://github.com/monero-project/monero && \
RUN git clone -b v0.18.2.0 --depth 1 https://github.com/monero-project/monero && \
cd monero && \
git reset --hard 727bc5b6878170332bf2d838f2c60d1c8dc685c8 && \
git reset --hard 99be9a044f3854f339548e2d99c539c18d7b1b01 && \
cp -a contrib/depends / && \
cd .. && \
rm -rf monero

View File

@ -108,7 +108,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.1.2`) to build the release binaries.
\* `master` - replace with the desired version tag (e.g. `v0.18.2.0`) to build the release binaries.
3. Prepare build environment
```
cd monero-gui
@ -131,7 +131,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.1.2`) to build the release binaries.
\* `master` - replace with the desired version tag (e.g. `v0.18.2.0`) to build the release binaries.
3. Prepare build environment
```
cd monero-gui

2
monero

@ -1 +1 @@
Subproject commit 66184f30859796f3c7c22f9497e41b15b5a4a7c9
Subproject commit 99be9a044f3854f339548e2d99c539c18d7b1b01