Skip to content

Commit be66075

Browse files
committed
CI attempt
1 parent 8078aba commit be66075

2 files changed

Lines changed: 11 additions & 17 deletions

File tree

.github/workflows/python-apollo.yml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,22 @@ jobs:
2424
- name: Setup Gradle
2525
uses: gradle/actions/setup-gradle@v4
2626

27-
- name: Setup Node.js
28-
uses: actions/setup-node@v4
29-
with:
30-
node-version: 18
31-
32-
- name: Install yarn
33-
run: npm install -g yarn
27+
- name: Build Apollo
28+
run: ./gradlew classes
3429

3530
- name: Start Apollo
3631
run: |
37-
./gradlew installJBrowseWebOnly compileGwt bootRun > apollo.log 2>&1 &
32+
./gradlew bootRun > apollo.log 2>&1 &
3833
3934
# Wait for health endpoint
40-
for i in $(seq 1 180); do
41-
response=$(curl -s 'http://localhost:8080/apollo/health/index' 2>/dev/null)
35+
for i in $(seq 1 300); do
36+
response=$(curl -s 'http://localhost:8080/apollo/health/index' 2>/dev/null || true)
4237
if echo "$response" | grep -q '"status":"ready"'; then
4338
echo "Apollo is ready (${i}s)"
4439
break
4540
fi
46-
if [ $i -eq 180 ]; then
47-
echo "FAIL: Apollo not ready after 180 seconds"
41+
if [ $i -eq 300 ]; then
42+
echo "FAIL: Apollo not ready after 300 seconds"
4843
cat apollo.log
4944
exit 1
5045
fi
@@ -66,13 +61,12 @@ jobs:
6661
- name: Install python-apollo
6762
run: |
6863
cd python-apollo
69-
pip install apollo
64+
pip install apollo pytest
7065
7166
- name: Bootstrap test data
7267
run: |
7368
cd python-apollo
7469
export ARROW_GLOBAL_CONFIG_PATH=$(pwd)/test-data/local-apollo2-arrow.yml
75-
arrow users get_users
7670
./bootstrap_apollo.sh --nodocker
7771
7872
- name: Run tests

src/test/groovy/org/bbop/apollo/ProxyControllerSpec.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ class ProxyControllerSpec extends Specification implements ControllerUnitTest<Pr
1212
}
1313

1414
def setup() {
15-
controller.permissionService = [
16-
checkPermissions: { PermissionEnum perm -> true }
17-
]
15+
controller.permissionService = Stub(PermissionService) {
16+
checkPermissions(_) >> true
17+
}
1818
}
1919

2020
void "Test the index action returns the correct model"() {

0 commit comments

Comments
 (0)