Skip to content

Commit 24dd2fd

Browse files
committed
RCPP-63 Switch to using Baasaas for sync tests
1 parent 7e17faf commit 24dd2fd

9 files changed

+631
-629
lines changed

.github/workflows/cmake.yml

+13-56
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
name: CMake Build
22

33
env:
4-
REALM_ATLAS_ENDPOINT: ${{ secrets.ATLAS_QA_BASE_URL }}
5-
REALM_BAAS_ENDPOINT: ${{ secrets.APPSERVICES_QA_BASE_URL }}
6-
REALM_ATLAS_API_KEY: ${{ secrets.ATLAS_QA_API_KEY }}
7-
REALM_ATLAS_PRIVATE_API_KEY: ${{ secrets.ATLAS_QA_PRIVATE_API_KEY }}
8-
REALM_ATLAS_PROJECT_ID: ${{ secrets.ATLAS_QA_PROJECT_ID}}
4+
APIKEY: ${{ secrets.REALM_BAASAAS_API_KEY }}
95
REALM_CI: true
106
REALM_DISABLE_ANALYTICS: true
117
on:
@@ -15,37 +11,26 @@ on:
1511
pull_request:
1612

1713
jobs:
18-
deploy-cluster:
14+
stop-all-containers:
1915
runs-on: ubuntu-latest
20-
name: Deploy Cluster
21-
outputs:
22-
clusterName: ${{ steps.deploy-cluster.outputs.clusterName }}
23-
steps:
24-
- uses: realm/ci-actions/mdb-realm/deploy@28a12a22e135d56db2b678fbe6479c0e1b52f169
25-
id: deploy-cluster
26-
with:
27-
atlasUrl: ${{ env.REALM_ATLAS_ENDPOINT }}
28-
realmUrl: ${{ env.REALM_BAAS_ENDPOINT }}
29-
projectId: ${{ env.REALM_ATLAS_PROJECT_ID }}
30-
apiKey: ${{ env.REALM_ATLAS_API_KEY }}
31-
privateApiKey: ${{ env.REALM_ATLAS_PRIVATE_API_KEY }}
32-
33-
delete-cluster:
34-
runs-on: ubuntu-latest
35-
name: Delete Cluster
16+
name: Stop Stray Containers
3617
if: always()
3718
needs:
3819
- build-macos-sync
3920
- build-linux-sync
4021
- build-windows-sync
4122
steps:
42-
- uses: realm/ci-actions/mdb-realm/cleanup@28a12a22e135d56db2b678fbe6479c0e1b52f169
23+
- name: Checkout Repository
24+
uses: actions/checkout@v3
4325
with:
44-
atlasUrl: ${{ env.REALM_ATLAS_ENDPOINT }}
45-
realmUrl: ${{ env.REALM_BAAS_ENDPOINT }}
46-
projectId: ${{ env.REALM_ATLAS_PROJECT_ID }}
47-
apiKey: ${{ env.REALM_ATLAS_API_KEY }}
48-
privateApiKey: ${{ env.REALM_ATLAS_PRIVATE_API_KEY }}
26+
repository: 'https://github.com/10gen/baasaas.git'
27+
ref: 'main'
28+
- name: Execute CLI
29+
run: |
30+
chmod +x ./cli.sh
31+
./cli.sh mine | grep '"id":' | awk -F '"' '{print $4}' | while read id; do
32+
./cli.sh stop "$id"
33+
done
4934
5035
5136
build-macos-xcode13_1:
@@ -64,10 +49,6 @@ jobs:
6449
- Release
6550
exclude:
6651
- configuration: ${{ (github.event_name == 'pull_request' && 'Release') || 'none' }}
67-
needs:
68-
- deploy-cluster
69-
env:
70-
REALM_ATLAS_CLUSTER_NAME: ${{ needs.deploy-cluster.outputs.clusterName }}
7152
steps:
7253
- name: Checkout
7354
uses: actions/checkout@v2
@@ -129,10 +110,6 @@ jobs:
129110
- Release
130111
exclude:
131112
- configuration: ${{ (github.event_name == 'pull_request' && 'Release') || 'none' }}
132-
needs:
133-
- deploy-cluster
134-
env:
135-
REALM_ATLAS_CLUSTER_NAME: ${{ needs.deploy-cluster.outputs.clusterName }}
136113
steps:
137114
- name: Checkout
138115
uses: actions/checkout@v2
@@ -194,10 +171,6 @@ jobs:
194171
- Release
195172
exclude:
196173
- configuration: ${{ (github.event_name == 'pull_request' && 'Release') || 'none' }}
197-
needs:
198-
- deploy-cluster
199-
env:
200-
REALM_ATLAS_CLUSTER_NAME: ${{ needs.deploy-cluster.outputs.clusterName }}
201174
steps:
202175
- name: Checkout
203176
uses: actions/checkout@v2
@@ -269,12 +242,8 @@ jobs:
269242
configuration:
270243
- Debug
271244
- Release
272-
needs:
273-
- deploy-cluster
274245
container:
275246
image: ${{ matrix.compiler.name == 'clang' && 'silkeh/clang' || matrix.compiler.name }}:${{ matrix.compiler.version }}
276-
env:
277-
REALM_ATLAS_CLUSTER_NAME: ${{ needs.deploy-cluster.outputs.clusterName }}
278247
steps:
279248
- name: Install Linux Dependencies
280249
run: |
@@ -341,10 +310,6 @@ jobs:
341310
configuration:
342311
- Debug
343312
- Release
344-
needs:
345-
- deploy-cluster
346-
env:
347-
REALM_ATLAS_CLUSTER_NAME: ${{ needs.deploy-cluster.outputs.clusterName }}
348313
steps:
349314
- name: Checkout
350315
uses: actions/checkout@v2
@@ -414,10 +379,6 @@ jobs:
414379
configuration:
415380
- Debug
416381
- Release
417-
needs:
418-
- deploy-cluster
419-
env:
420-
REALM_ATLAS_CLUSTER_NAME: ${{ needs.deploy-cluster.outputs.clusterName }}
421382
steps:
422383
- name: Checkout
423384
uses: actions/checkout@v2
@@ -459,10 +420,6 @@ jobs:
459420
configuration:
460421
- Debug
461422
- Release
462-
needs:
463-
- deploy-cluster
464-
env:
465-
REALM_ATLAS_CLUSTER_NAME: ${{ needs.deploy-cluster.outputs.clusterName }}
466423
steps:
467424
- name: Checkout
468425
uses: actions/checkout@v2

src/cpprealm/analytics.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ namespace realm {
128128

129129
return (info.kp_proc.p_flag & P_TRACED) != 0;
130130
}
131-
#elif __linux__
131+
#elif __linux__ && ndef(__ANDROID__)
132132
std::string print_hex(unsigned char *bs, unsigned int len) {
133133
std::stringstream ss;
134134
for (size_t i = 0; i < len; i++) {

0 commit comments

Comments
 (0)