Skip to content

Commit

Permalink
Merge pull request #4120
Browse files Browse the repository at this point in the history
a50491d build: prepare v0.18.2.0 (selsta)
  • Loading branch information
luigi1111 committed Feb 25, 2023
2 parents cb9af34 + a50491d commit 6ec9e24
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion monero
Submodule monero updated 43 files
+4 −3 .github/workflows/build.yml
+1 −1 .github/workflows/depends.yml
+49 −0 .github/workflows/gitian.yml
+13 −1 CMakeLists.txt
+5 −5 README.md
+1 −1 cmake/FindLibUSB.cmake
+4 −1 contrib/depends/funcs.mk
+3 −3 contrib/depends/packages/hidapi.mk
+3 −3 contrib/depends/packages/libusb.mk
+3 −5 contrib/depends/packages/openssl.mk
+0 −60 contrib/depends/patches/openssl/fix_darwin.patch
+1 −1 contrib/epee/src/portable_storage.cpp
+1 −1 contrib/gitian/DOCKRUN.md
+1 −1 contrib/gitian/README.md
+83 −74 src/blockchain_utilities/blockchain_stats.cpp
+ src/blocks/checkpoints.dat
+1 −0 src/checkpoints/checkpoints.cpp
+65 −0 src/common/data_cache.h
+2 −15 src/common/dns_utils.cpp
+0 −9 src/common/dns_utils.h
+1 −0 src/common/threadpool.h
+25 −15 src/crypto/c_threads.h
+6 −2 src/crypto/hash-ops.h
+335 −189 src/crypto/rx-slow-hash.c
+3 −2 src/cryptonote_basic/miner.cpp
+30 −16 src/cryptonote_core/blockchain.cpp
+3 −1 src/cryptonote_core/blockchain.h
+6 −20 src/cryptonote_core/cryptonote_tx_utils.cpp
+4 −8 src/cryptonote_core/cryptonote_tx_utils.h
+4 −3 src/cryptonote_protocol/levin_notify.cpp
+7 −1 src/net/parse.cpp
+10 −0 src/net/parse.h
+15 −23 src/p2p/net_node.inl
+37 −0 src/ringct/rctSigs.cpp
+1 −0 src/ringct/rctSigs.h
+1 −3 src/rpc/rpc_payment.cpp
+1 −1 src/version.cpp.in
+3 −3 src/wallet/api/wallet.cpp
+2 −6 src/wallet/wallet2.cpp
+1 −2 src/wallet/wallet_rpc_payments.cpp
+11 −0 tests/unit_tests/dns_resolver.cpp
+84 −15 tests/unit_tests/levin.cpp
+35 −0 tests/unit_tests/net.cpp

0 comments on commit 6ec9e24

Please sign in to comment.