Skip to content

Commit 54cf199

Browse files
just give it the time it needs I guess
1 parent 6fb8443 commit 54cf199

5 files changed

Lines changed: 10 additions & 31 deletions

File tree

.github/workflows/ci-build.yml

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,11 @@ on:
1010
jobs:
1111
build:
1212
runs-on: ubuntu-latest
13-
timeout-minutes: 15
13+
timeout-minutes: 30
1414
strategy:
1515
fail-fast: false
1616
matrix:
1717
java-version: ["8", "14", "17"]
18-
include:
19-
- java-version: "8"
20-
maven-opts: "-Djacoco.skip=true -Xmx4g -Xms512m"
21-
- java-version: "14"
22-
maven-opts: "-Xmx4g -Xms512m"
23-
- java-version: "17"
24-
maven-opts: "-Djacoco.skip=true -Xmx4g -Xms512m"
2518
permissions:
2619
contents: read
2720
steps:
@@ -41,24 +34,15 @@ jobs:
4134
restore-keys: |
4235
v1-${{ runner.os }}-maven-${{ matrix.java-version }}-
4336
- name: Compile
44-
run: |
45-
if [ ${{ matrix.java-version }} == "8" ]; then
46-
export TRAVIS_JDK=openjdk8
47-
fi
48-
./scripts/run_no_prep_tests.sh clean compile test-compile
37+
run: ./scripts/run_no_prep_tests.sh clean compile test-compile
4938
env:
50-
CI_ARGS: "--batch-mode"
51-
MAVEN_OPTS: ${{ matrix.maven-opts }}
39+
CI_ARGS: "--batch-mode -T 1C"
40+
MAVEN_OPTS: "-Xmx4g -Xms512m"
5241
- name: Run tests
53-
run: |
54-
if [ ${{ matrix.java-version }} == "8" ]; then
55-
export TRAVIS_JDK=openjdk8
56-
fi
57-
./scripts/run_no_prep_tests.sh test
42+
run: ./scripts/run_no_prep_tests.sh test
5843
env:
5944
CI_ARGS: "--batch-mode"
6045
SKIP_UNSTABLE_TESTS: 1
61-
MAVEN_OPTS: ${{ matrix.maven-opts }}
6246
- name: Upload test results to Codecov
6347
if: ${{ !cancelled() }}
6448
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2

scripts/install_local.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
#!/bin/bash
22
is_jdk_8=`echo $JAVA_HOME | grep 8.`
3-
is_travis_jdk_8=`echo $TRAVIS_JDK | grep openjdk8`
4-
if [[ "${is_jdk_8}" != "" && "${is_travis_jdk_8}" != "" ]];
3+
if [[ "${is_jdk_8}" != "" ]];
54
then
65
echo "Please use OpenJDK 11."
76
exit 1
87
fi
98

10-
./mvnw install -Dmaven.test.skip=true
9+
./mvnw install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -T 1C

scripts/release.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#!/bin/bash
22

33
is_jdk_8=$(echo "$JAVA_HOME" | grep 8.)
4-
is_travis_jdk_8=$(echo "$TRAVIS_JDK" | grep openjdk8)
5-
if [[ "${is_jdk_8}" != "" && "${is_travis_jdk_8}" != "" ]];
4+
if [[ "${is_jdk_8}" != "" ]];
65
then
76
echo "Please use OpenJDK 11 for releasing these libraries."
87
exit 1

scripts/run_all_bolt_tests.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/bash
22
is_jdk_8=`echo $JAVA_HOME | grep 8.`
3-
is_travis_jdk_8=`echo $TRAVIS_JDK | grep openjdk8`
4-
if [[ "${is_jdk_8}" != "" && "${is_travis_jdk_8}" != "" ]];
3+
if [[ "${is_jdk_8}" != "" ]];
54
then
65
echo "Please use OpenJDK 11 for running these tests."
76
exit 1

scripts/run_no_prep_tests.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@
66
#
77
# Environment variables:
88
# CI_ARGS - Additional Maven CLI options (e.g., "--batch-mode -T 1C")
9-
# TRAVIS_JDK - Set to "openjdk8" to use JDK 8 module exclusions
109

1110
MVN_PHASES="${*:-clean test}"
1211

1312
is_jdk_8=`echo $JAVA_HOME | grep 8.`
1413
is_jdk_14=`echo $JAVA_HOME | grep 14.`
1514

16-
is_travis_jdk_8=`echo $TRAVIS_JDK | grep openjdk8`
17-
if [[ "${is_jdk_8}" != "" && "${is_travis_jdk_8}" != "" ]];
15+
if [[ "${is_jdk_8}" != "" ]];
1816
then
1917
./mvnw \
2018
-pl !bolt-google-cloud-functions \

0 commit comments

Comments
 (0)