diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2023-02-25 13:56:09 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2023-02-25 13:56:09 -0500 |
| commit | 6ec9e24f2f69b73763e7ebd0295741c65e0a08cd (patch) | |
| tree | 55044876dc709fb4e9e50bdd953c362f68dcc955 | |
| parent | cb9af349cd692b1c5f5dd924aa904b942ddcfdf7 (diff) | |
| parent | a50491d0b2c6c96663275dc44f59920daafb8087 (diff) | |
| download | monzero-gui-6ec9e24f2f69b73763e7ebd0295741c65e0a08cd.tar.gz monzero-gui-6ec9e24f2f69b73763e7ebd0295741c65e0a08cd.tar.xz monzero-gui-6ec9e24f2f69b73763e7ebd0295741c65e0a08cd.zip | |
Merge pull request #4120
a50491d build: prepare v0.18.2.0 (selsta)
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Dockerfile.windows | 4 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| m--------- | monero | 0 |
4 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ea643c09..654604fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") diff --git a/Dockerfile.windows b/Dockerfile.windows index b27352e0..0401bab5 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.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 @@ -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 diff --git a/monero b/monero -Subproject 66184f30859796f3c7c22f9497e41b15b5a4a7c +Subproject 99be9a044f3854f339548e2d99c539c18d7b1b0 |