Skip to content

Commit 25452f6

Browse files
committed
Install Java 17 and latest Bazelisk version.
1 parent 39cfb9b commit 25452f6

File tree

3 files changed

+36
-17
lines changed

3 files changed

+36
-17
lines changed

.github/workflows/bazel.yml

+19-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
branches:
55
- master
66
pull_request:
7+
workflow_dispatch:
78
jobs:
89
bazel:
910
runs-on: ubuntu-latest
@@ -14,23 +15,38 @@ jobs:
1415
with:
1516
path: "/home/runner/.cache/bazel"
1617
key: bazel
18+
- name: Set up JDK 17
19+
uses: actions/setup-java@v4
20+
with:
21+
java-version: '17'
22+
distribution: 'temurin'
1723
- name: Install bazelisk
1824
run: |
19-
curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.1.0/bazelisk-linux-amd64"
25+
curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.26.0/bazelisk-linux-amd64"
2026
mkdir -p "${GITHUB_WORKSPACE}/bin/"
2127
mv bazelisk-linux-amd64 "${GITHUB_WORKSPACE}/bin/bazel"
2228
chmod +x "${GITHUB_WORKSPACE}/bin/bazel"
29+
- name: Build
30+
uses: nick-invision/retry@v3
31+
with:
32+
timeout_minutes: 10
33+
max_attempts: 3
34+
command: |
35+
cd "${GITHUB_WORKSPACE}"
36+
"${GITHUB_WORKSPACE}/bin/bazel" build //...
2337
- name: Test
2438
uses: nick-invision/retry@v3
2539
with:
2640
timeout_minutes: 10
2741
max_attempts: 3
2842
command: |
43+
cd "${GITHUB_WORKSPACE}"
2944
"${GITHUB_WORKSPACE}/bin/bazel" test //...
30-
- name: Build
45+
- name: Test bzl-examples/bzlmod
3146
uses: nick-invision/retry@v3
3247
with:
3348
timeout_minutes: 10
3449
max_attempts: 3
3550
command: |
36-
"${GITHUB_WORKSPACE}/bin/bazel" build //...
51+
cd "${GITHUB_WORKSPACE}/bzl-examples/bzlmod"
52+
"${GITHUB_WORKSPACE}/bin/bazel" test //...

.github/workflows/gradle.yml

+11-8
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,34 @@
1+
# Local:
2+
# $ act -P ubuntu-latest=catthehacker/ubuntu:act-latest -W .github/workflows/gradle.yml
13
name: Gradle Build
24
on:
35
push:
46
branches:
57
- master
68
pull_request:
7-
9+
workflow_dispatch:
810
jobs:
911
gradle:
1012
strategy:
1113
matrix:
12-
os: [ubuntu-latest, macos-12]
14+
os: [ubuntu-latest, macos-13]
1315
runs-on: ${{ matrix.os }}
1416
steps:
1517
- uses: actions/checkout@v4
1618

17-
- uses: actions/setup-java@v4
19+
- name: Set up JDK 17
20+
uses: actions/setup-java@v4
1821
with:
22+
java-version: '17'
1923
distribution: 'temurin'
20-
java-version: '11'
21-
cache: 'gradle'
2224

23-
- uses: gradle/gradle-build-action@v3
25+
- name: Set up Gradle
26+
uses: gradle/actions/setup-gradle@v3
2427

2528
- name: Test on Mac
26-
if: matrix.os == 'macos-12'
29+
if: matrix.os == 'macos-13'
2730
run: |
28-
brew install docker
31+
brew install docker colima
2932
colima start --network-address
3033
export TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE=/var/run/docker.sock
3134
export TESTCONTAINERS_HOST_OVERRIDE=$(colima ls -j | jq -r '.address')

.github/workflows/release.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ jobs:
1010
steps:
1111
- uses: actions/checkout@v4
1212

13-
- uses: actions/setup-java@v4
13+
- name: Set up JDK 17
14+
uses: actions/setup-java@v4
1415
with:
15-
distribution: 'adopt'
16-
java-version: '11'
17-
cache: 'gradle'
16+
java-version: '17'
17+
distribution: 'temurin'
1818

19-
- name: Setup Gradle
20-
uses: gradle/gradle-build-action@v3
19+
- name: Set up Gradle
20+
uses: gradle/actions/setup-gradle@v3
2121

2222
- name: release
2323
env:

0 commit comments

Comments
 (0)