Skip to content

Commit f962bb6

Browse files
committed
Revert "try inlining"
This reverts commit cd0a245.
1 parent 820cd14 commit f962bb6

File tree

2 files changed

+12
-79
lines changed

2 files changed

+12
-79
lines changed

.github/actions/coverage-report/action.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,27 @@ runs:
2727
using: composite
2828
steps:
2929
- name: Read Config
30-
shell: bash
30+
shell: ${{ env.shell }}
3131
run: cat .github/config.env >> $GITHUB_ENV
3232

3333
- name: Install Necessary Packages
34-
shell: bash
34+
shell: ${{ env.shell }}
3535
run: |
3636
sudo apt-get update
3737
sudo apt-get install -y net-tools libssl-dev gdb gcovr curl
3838
3939
- name: Download hazelcast-enterprise-tests.jar
40-
shell: bash
40+
shell: ${{ env.shell }}
4141
run: |
4242
curl -H "Authorization: token ${{ inputs.GH_TOKEN }}" https://raw.githubusercontent.com/hazelcast/private-test-artifacts/data/certs.jar > hazelcast-enterprise-${{ env.HAZELCAST_VERSION }}-tests.jar
4343
4444
- name: Install Boost
45-
shell: bash
45+
shell: ${{ env.shell }}
4646
run: |
4747
sudo ./scripts/install-boost.sh ${{ inputs.BOOST_VERSION }}
4848
4949
- name: Install Thrift
50-
shell: bash
50+
shell: ${{ env.shell }}
5151
run: |
5252
sudo ./scripts/install-thrift.sh ${{ inputs.THRIFT_VERSION }}
5353
@@ -61,7 +61,7 @@ runs:
6161
env:
6262
BUILD_DIR: build
6363
COVERAGE: ON
64-
shell: bash
64+
shell: ${{ env.shell }}
6565
run: |
6666
./scripts/build-unix.sh \
6767
-DCMAKE_BUILD_TYPE=Debug \
@@ -78,15 +78,15 @@ runs:
7878
AWS_ACCESS_KEY_ID: ${{ inputs.AWS_ACCESS_KEY_ID }}
7979
AWS_SECRET_ACCESS_KEY: ${{ inputs.AWS_SECRET_ACCESS_KEY }}
8080
HZ_TEST_AWS_INSTANCE_PRIVATE_IP: ${{ inputs.HZ_TEST_AWS_INSTANCE_PRIVATE_IP }}
81-
shell: bash
81+
shell: ${{ env.shell }}
8282
run: |
8383
ulimit -c unlimited
8484
sudo sh -c "echo 'core' > /proc/sys/kernel/core_pattern"
8585
sudo sh -c "echo '1' > /proc/sys/kernel/core_uses_pid"
8686
./scripts/test-unix.sh
8787
8888
- name: Collect coverage info
89-
shell: bash
89+
shell: ${{ env.shell }}
9090
run: |
9191
# collect and list coverage info
9292
lcov --capture --directory . --no-external -o coverage.info \

.github/workflows/build-pr.yml

Lines changed: 4 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -115,82 +115,15 @@ jobs:
115115
ref: ${{ needs.get-refs.outputs.ref }}
116116
token: ${{ secrets.GH_TOKEN }}
117117

118-
- name: Read Config
119-
shell: bash
120-
run: cat .github/config.env >> $GITHUB_ENV
121-
122-
- name: Install Necessary Packages
123-
shell: bash
124-
run: |
125-
sudo apt-get update
126-
sudo apt-get install -y net-tools libssl-dev gdb gcovr curl
127-
128-
- name: Download hazelcast-enterprise-tests.jar
129-
shell: bash
130-
run: |
131-
curl -H "Authorization: token ${{ secrets.GH_TOKEN }}" https://raw.githubusercontent.com/hazelcast/private-test-artifacts/data/certs.jar > hazelcast-enterprise-${{ env.HAZELCAST_VERSION }}-tests.jar
132-
133-
- name: Install Boost
134-
shell: bash
135-
run: |
136-
sudo ./scripts/install-boost.sh ${{ env.boost_version }}
137-
138-
- name: Install Thrift
139-
shell: bash
140-
run: |
141-
sudo ./scripts/install-thrift.sh ${{ env.thrift_version }}
142-
143-
- name: Setup JDK
144-
uses: actions/setup-java@v4
118+
- uses: ./.github/actions/coverage-report
145119
with:
146-
java-version: ${{ env.JAVA_VERSION }}
147-
distribution: ${{ env.JAVA_DISTRIBUTION }}
148-
149-
- name: Build & Install
150-
env:
151-
BUILD_DIR: build
152-
COVERAGE: ON
153-
shell: bash
154-
run: |
155-
./scripts/build-unix.sh \
156-
-DCMAKE_BUILD_TYPE=Debug \
157-
-DBUILD_SHARED_LIBS=ON \
158-
-DWITH_OPENSSL=ON \
159-
-DBUILD_TESTS=ON \
160-
-DBUILD_EXAMPLES=OFF
161-
162-
- name: Test
163-
if: ${{ env.run_tests }}
164-
env:
165-
BUILD_DIR: build
120+
BOOST_VERSION: ${{ env.boost_version }}
121+
THRIFT_VERSION: ${{ env.thrift_version }}
122+
RUN_TESTS: ${{ env.run_tests }}
166123
HAZELCAST_ENTERPRISE_KEY: ${{ secrets.HAZELCAST_ENTERPRISE_KEY }}
167124
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
168125
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
169126
HZ_TEST_AWS_INSTANCE_PRIVATE_IP: ${{ secrets.HZ_TEST_AWS_INSTANCE_PRIVATE_IP }}
170-
shell: bash
171-
run: |
172-
ulimit -c unlimited
173-
sudo sh -c "echo 'core' > /proc/sys/kernel/core_pattern"
174-
sudo sh -c "echo '1' > /proc/sys/kernel/core_uses_pid"
175-
./scripts/test-unix.sh
176-
177-
- name: Collect coverage info
178-
shell: bash
179-
run: |
180-
# collect and list coverage info
181-
lcov --capture --directory . --no-external -o coverage.info \
182-
--include "`pwd`/hazelcast/*" --exclude "`pwd`/hazelcast/test/*"
183-
lcov --list coverage.info
184-
# generate HTML views
185-
genhtml coverage.info --output-directory=coverage-html-reports
186-
187-
- name: Upload HTML views as artifact
188-
uses: actions/upload-artifact@v2
189-
with:
190-
name: coverage-report
191-
path: |
192-
coverage.info
193-
coverage-html-reports
194127

195128
Ubuntu-i386:
196129
needs: get-refs

0 commit comments

Comments
 (0)