Skip to content

Commit a239e34

Browse files
committed
Fix permissions and typo
1 parent e468aeb commit a239e34

File tree

5 files changed

+40
-32
lines changed

5 files changed

+40
-32
lines changed

.github/workflows/contributor-build.yml

+20-16
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# See https://docs.github.com/en/free-pro-team@latest/actions
55
# for more information about GitHub actions.
66

7-
name: Hibernate ORM contributor build
7+
name: Hibernate ORM build
88

99
on:
1010
push:
@@ -17,25 +17,30 @@ on:
1717
- 'wip/6.0'
1818
jobs:
1919
build:
20-
name: Build and test on Java 8 against a wide range of DBs
20+
name: Java 8
2121
runs-on: ubuntu-latest
22+
# We want to know the test results of all matrix entries
23+
continue-on-error: true
2224
strategy:
25+
fail-fast: false
2326
matrix:
27+
# When GitHub Actions supports it: https://github.com/actions/toolkit/issues/399
28+
# We will use the experimental flag as indicator whether a failure should cause a workflow failure
2429
include:
2530
- rdbms: h2
26-
jdk: 8
31+
experimental: false
2732
- rdbms: derby
28-
jdk: 8
33+
experimental: true
2934
- rdbms: mariadb
30-
jdk: 8
35+
experimental: true
3136
- rdbms: postgresql
32-
jdk: 8
37+
experimental: true
3338
- rdbms: oracle
34-
jdk: 8
39+
experimental: true
3540
- rdbms: db2
36-
jdk: 8
41+
experimental: true
3742
- rdbms: mssql
38-
jdk: 8
43+
experimental: true
3944
steps:
4045
- uses: actions/checkout@v2
4146
- name: Set up Java 8
@@ -60,20 +65,21 @@ jobs:
6065
- name: Run build script
6166
env:
6267
RDBMS: ${{ matrix.rdbms }}
63-
JDK: ${{ matrix.jdk }}
64-
run: ./ci/build-guthub.sh
68+
run: ./ci/build-github.sh
6569
shell: bash
6670
- name: Upload test reports (if Gradle failed)
6771
uses: actions/upload-artifact@v2
6872
if: failure()
6973
with:
70-
name: test-reports-java8
74+
name: test-reports-java8-${{ matrix.rdbms }}
7175
path: './**/target/reports/tests/test/'
7276
- name: Omit produced artifacts from build cache
7377
run: ./ci/before-cache.sh
7478
build11:
75-
name: Build and test on Java 11
79+
name: Java 11
7680
runs-on: ubuntu-latest
81+
# We want to know the test results of all matrix entries
82+
continue-on-error: true
7783
steps:
7884
- uses: actions/checkout@v2
7985
- name: Set up Java 11
@@ -96,9 +102,7 @@ jobs:
96102
# refresh cache every month to avoid unlimited growth
97103
key: maven-localrepo-${{ steps.get-date.outputs.yearmonth }}
98104
- name: Run build script
99-
env:
100-
JDK: 11
101-
run: ./ci/build-guthub.sh
105+
run: ./ci/build-github.sh
102106
shell: bash
103107
- name: Upload test reports (if Gradle failed)
104108
uses: actions/upload-artifact@v2

ci/before-cache.sh

100644100755
File mode changed.

ci/build-github.sh

100644100755
+10-8
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
#! /bin/bash
22

3+
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
4+
35
java -version
46
./gradlew assemble
57
if [ "$RDBMS" == 'mysql' ]; then
6-
bash ../docker_db.sh mysql_5_7
8+
bash $DIR/../docker_db.sh mysql_5_7
79
elif [ "$RDBMS" == 'mysql8' ]; then
8-
bash ../docker_db.sh mysql_8_0
10+
bash $DIR/../docker_db.sh mysql_8_0
911
elif [ "$RDBMS" == 'mariadb' ]; then
10-
bash ../docker_db.sh mariadb
12+
bash $DIR/../docker_db.sh mariadb
1113
elif [ "$RDBMS" == 'postgresql' ]; then
12-
bash ../docker_db.sh postgresql_9_5
14+
bash $DIR/../docker_db.sh postgresql_9_5
1315
elif [ "$RDBMS" == 'db2' ]; then
14-
bash ../docker_db.sh db2
16+
bash $DIR/../docker_db.sh db2
1517
elif [ "$RDBMS" == 'oracle' ]; then
16-
bash ../docker_db.sh oracle
18+
bash $DIR/../docker_db.sh oracle
1719
elif [ "$RDBMS" == 'mssql' ]; then
18-
bash ../docker_db.sh mssql
20+
bash $DIR/../docker_db.sh mssql
1921
fi
2022

21-
exec bash ./build.sh
23+
exec bash $DIR/build.sh

ci/build-travis.sh

100644100755
+10-8
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,27 @@
11
#! /bin/bash
22

3+
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
4+
35
java -version
46
./gradlew assemble
57
if [ "$RDBMS" == 'mysql' ]; then
68
sudo service mysql stop
7-
bash ../docker_db.sh mysql_5_7
9+
bash $DIR/../docker_db.sh mysql_5_7
810
elif [ "$RDBMS" == 'mysql8' ]; then
911
sudo service mysql stop
10-
bash ../docker_db.sh mysql_8_0
12+
bash $DIR/../docker_db.sh mysql_8_0
1113
elif [ "$RDBMS" == 'mariadb' ]; then
1214
sudo service mysql stop
13-
bash ../docker_db.sh mariadb
15+
bash $DIR/../docker_db.sh mariadb
1416
elif [ "$RDBMS" == 'postgresql' ]; then
1517
sudo service postgres stop
16-
bash ../docker_db.sh postgresql_9_5
18+
bash $DIR/../docker_db.sh postgresql_9_5
1719
elif [ "$RDBMS" == 'db2' ]; then
18-
bash ../docker_db.sh db2
20+
bash $DIR/../docker_db.sh db2
1921
elif [ "$RDBMS" == 'oracle' ]; then
20-
bash ../docker_db.sh oracle
22+
bash $DIR/../docker_db.sh oracle
2123
elif [ "$RDBMS" == 'mssql' ]; then
22-
bash ../docker_db.sh mssql
24+
bash $DIR/../docker_db.sh mssql
2325
fi
2426

25-
exec bash ./build.sh
27+
exec bash $DIR/build.sh

ci/build.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)