Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge develop branch into hardfork branch #2796

Merged
merged 4 commits into from
Dec 5, 2023
Merged

Merge develop branch into hardfork branch #2796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ea02e6
Bump FC again to improve node networking stability
abitmore Nov 18, 2023
8020670
Update dependency versions used in Github Actions
abitmore Nov 18, 2023
e8a469b
Merge pull request #2791 from bitshares/bump_fc
abitmore Nov 18, 2023
7343107
Merge pull request #2795 from bitshares/release
abitmore Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test.ubuntu-debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ${{ matrix.os }}
services:
elasticsearch8:
image: elastic/elasticsearch:8.10.2
image: elastic/elasticsearch:8.11.1
options: >-
--env ES_JAVA_OPTS="-Xms512m -Xmx512m"
--env discovery.type=single-node
Expand All @@ -22,7 +22,7 @@ jobs:
--env cluster.routing.allocation.disk.threshold_enabled=false
--publish 9200:9200
elasticsearch7:
image: elastic/elasticsearch:7.17.13
image: elastic/elasticsearch:7.17.15
options: >-
--env ES_JAVA_OPTS="-Xms512m -Xmx512m"
--env discovery.type=single-node
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test.ubuntu-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ${{ matrix.os }}
services:
elasticsearch8:
image: elastic/elasticsearch:8.10.2
image: elastic/elasticsearch:8.11.1
options: >-
--env ES_JAVA_OPTS="-Xms512m -Xmx512m"
--env discovery.type=single-node
Expand All @@ -22,7 +22,7 @@ jobs:
--env cluster.routing.allocation.disk.threshold_enabled=false
--publish 9200:9200
elasticsearch7:
image: elastic/elasticsearch:7.17.13
image: elastic/elasticsearch:7.17.15
options: >-
--env ES_JAVA_OPTS="-Xms512m -Xmx512m"
--env discovery.type=single-node
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ env:
# The following are for windows cross-build only:
BOOST_VERSION: 1_69_0
BOOST_DOTTED_VERSION: 1.69.0
CURL_VERSION: 8.3.0
CURL_VERSION: 8.4.0
OPENSSL_VERSION: 1.1.1w
ZLIB_VERSION: 1.3
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonar-scan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ${{ matrix.os }}
services:
elasticsearch8:
image: elastic/elasticsearch:8.10.2
image: elastic/elasticsearch:8.11.1
options: >-
--env ES_JAVA_OPTS="-Xms512m -Xmx512m"
--env discovery.type=single-node
Expand Down
2 changes: 1 addition & 1 deletion libraries/fc
Open in desktop
Submodule fc updated 1 files
+34 −5 src/asio.cpp