Skip to content

Commit f5a57f6

Browse files
authored
Merge pull request #2709 from bitshares/fix-ubuntu-release-build
Fix Github Actions Ubuntu release build (Follow-up of PR #2707)
2 parents 6e0e232 + 40a13a1 commit f5a57f6

4 files changed

+17
-20
lines changed

.github/workflows/build-and-test.mac.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
run: |
4343
export CCACHE_DIR="$GITHUB_WORKSPACE/ccache"
4444
mkdir -p "$CCACHE_DIR"
45-
make -j 2 -C _build witness_node cli_wallet app_test cli_test chain_test
45+
make -j 3 -C _build witness_node cli_wallet app_test cli_test chain_test
4646
df -h
4747
- name: Unit-Tests
4848
run: |

.github/workflows/build-and-test.ubuntu-debug.yml

+9-12
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
elasticsearch8:
1515
image: elastic/elasticsearch:8.5.3
1616
options: >-
17+
--env ES_JAVA_OPTS="-Xms512m -Xmx512m"
1718
--env discovery.type=single-node
1819
--env xpack.security.enabled=false
1920
--env xpack.security.http.ssl.enabled=false
@@ -23,6 +24,7 @@ jobs:
2324
elasticsearch7:
2425
image: elastic/elasticsearch:7.17.8
2526
options: >-
27+
--env ES_JAVA_OPTS="-Xms512m -Xmx512m"
2628
--env discovery.type=single-node
2729
--env cluster.routing.allocation.disk.threshold_enabled=false
2830
--publish 9201:9200
@@ -63,11 +65,6 @@ jobs:
6365
pwd
6466
df -h .
6567
free
66-
sudo dd if=/dev/zero of=/swapfile bs=1024 count=4M
67-
sudo chmod 600 /swapfile
68-
sudo mkswap /swapfile
69-
sudo swapon /swapfile
70-
free
7168
mkdir -p _build
7269
sudo mkdir -p /_build/libraries /_build/programs /_build/tests /mnt/_build
7370
sudo chmod a+rwx /_build/libraries /_build/programs /_build/tests
@@ -101,13 +98,13 @@ jobs:
10198
export CCACHE_DIR="$GITHUB_WORKSPACE/ccache"
10299
mkdir -p "$CCACHE_DIR"
103100
df -h
104-
make -j 1 -C _build chain_test
105-
make -j 1 -C _build cli_test
106-
make -j 1 -C _build app_test
107-
make -j 1 -C _build es_test
108-
make -j 1 -C _build cli_wallet
109-
make -j 1 -C _build witness_node
110-
make -j 1 -C _build
101+
make -j 2 -C _build chain_test
102+
make -j 2 -C _build cli_test
103+
make -j 2 -C _build app_test
104+
make -j 2 -C _build es_test
105+
make -j 2 -C _build cli_wallet
106+
make -j 2 -C _build witness_node
107+
make -j 2 -C _build
111108
df -h
112109
du -hs _build/libraries/* _build/programs/* _build/tests/*
113110
du -hs _build/*

.github/workflows/build-and-test.ubuntu-release.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
elasticsearch8:
1515
image: elastic/elasticsearch:8.5.3
1616
options: >-
17+
--env ES_JAVA_OPTS="-Xms512m -Xmx512m"
1718
--env discovery.type=single-node
1819
--env xpack.security.enabled=false
1920
--env xpack.security.http.ssl.enabled=false
@@ -23,6 +24,7 @@ jobs:
2324
elasticsearch7:
2425
image: elastic/elasticsearch:7.17.8
2526
options: >-
27+
--env ES_JAVA_OPTS="-Xms512m -Xmx512m"
2628
--env discovery.type=single-node
2729
--env cluster.routing.allocation.disk.threshold_enabled=false
2830
--publish 9201:9200
@@ -57,6 +59,8 @@ jobs:
5759
submodules: recursive
5860
- name: Configure
5961
run: |
62+
df -h
63+
free
6064
mkdir -p _build
6165
pushd _build
6266
export -n BOOST_ROOT BOOST_INCLUDEDIR BOOST_LIBRARYDIR
@@ -80,7 +84,7 @@ jobs:
8084
run: |
8185
export CCACHE_DIR="$GITHUB_WORKSPACE/ccache"
8286
mkdir -p "$CCACHE_DIR"
83-
make -j 1 -C _build
87+
make -j 2 -C _build
8488
df -h
8589
- name: Unit-Tests
8690
run: |

.github/workflows/sonar-scan.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
elasticsearch8:
1515
image: elastic/elasticsearch:8.5.3
1616
options: >-
17+
--env ES_JAVA_OPTS="-Xms512m -Xmx512m"
1718
--env discovery.type=single-node
1819
--env xpack.security.enabled=false
1920
--env xpack.security.http.ssl.enabled=false
@@ -76,11 +77,6 @@ jobs:
7677
pwd
7778
df -h .
7879
free
79-
sudo dd if=/dev/zero of=/swapfile bs=1024 count=4M
80-
sudo chmod 600 /swapfile
81-
sudo mkswap /swapfile
82-
sudo swapon /swapfile
83-
free
8480
mkdir -p _build
8581
sudo mkdir -p /_build/libraries /_build/programs /mnt/_build/tests
8682
sudo chmod a+rwx /_build/libraries /_build/programs /mnt/_build/tests
@@ -123,7 +119,7 @@ jobs:
123119
export CCACHE_DIR="$GITHUB_WORKSPACE/ccache"
124120
mkdir -p "$CCACHE_DIR"
125121
df -h
126-
programs/build_helpers/make_with_sonar bw-output -j 1 -C _build \
122+
programs/build_helpers/make_with_sonar bw-output -j 2 -C _build \
127123
witness_node cli_wallet js_operation_serializer get_dev_key network_mapper \
128124
app_test chain_test cli_test es_test
129125
df -h

0 commit comments

Comments
 (0)