Skip to content

Commit 63e7f9a

Browse files
authored
ci: Run colima delete on macOS (#2915)
1 parent eebee4d commit 63e7f9a

File tree

8 files changed

+21
-11
lines changed

8 files changed

+21
-11
lines changed

.github/workflows/check-libxrpl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
fetch-depth: 0
3030

3131
- name: Prepare runner
32-
uses: XRPLF/actions/prepare-runner@f05cab7b8541eee6473aa42beb9d2fe35608a190
32+
uses: XRPLF/actions/prepare-runner@e8d2d2a546a03e1d161dca52890705f3bc641215
3333
with:
3434
enable_ccache: false
3535

.github/workflows/clang-tidy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
fetch-depth: 0
4545

4646
- name: Prepare runner
47-
uses: XRPLF/actions/prepare-runner@f05cab7b8541eee6473aa42beb9d2fe35608a190
47+
uses: XRPLF/actions/prepare-runner@e8d2d2a546a03e1d161dca52890705f3bc641215
4848
with:
4949
enable_ccache: false
5050

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
lfs: true
2828

2929
- name: Prepare runner
30-
uses: XRPLF/actions/prepare-runner@f05cab7b8541eee6473aa42beb9d2fe35608a190
30+
uses: XRPLF/actions/prepare-runner@e8d2d2a546a03e1d161dca52890705f3bc641215
3131
with:
3232
enable_ccache: false
3333

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
run-hooks:
11-
uses: XRPLF/actions/.github/workflows/pre-commit.yml@282890f46d6921249d5659dd38babcb0bd8aef48
11+
uses: XRPLF/actions/.github/workflows/pre-commit.yml@01163508e81d7dd63d4601d4090b297a260b18c2
1212
with:
1313
runs_on: heavy
1414
container: '{ "image": "ghcr.io/xrplf/clio-pre-commit:14342e087ceb8b593027198bf9ef06a43833c696" }'

.github/workflows/reusable-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
fetch-depth: 0
9696

9797
- name: Prepare runner
98-
uses: XRPLF/actions/prepare-runner@f05cab7b8541eee6473aa42beb9d2fe35608a190
98+
uses: XRPLF/actions/prepare-runner@e8d2d2a546a03e1d161dca52890705f3bc641215
9999
with:
100100
enable_ccache: ${{ inputs.download_ccache }}
101101

.github/workflows/reusable-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
fetch-depth: 0
6161

6262
- name: Prepare runner
63-
uses: XRPLF/actions/prepare-runner@f05cab7b8541eee6473aa42beb9d2fe35608a190
63+
uses: XRPLF/actions/prepare-runner@e8d2d2a546a03e1d161dca52890705f3bc641215
6464
with:
6565
enable_ccache: false
6666

.github/workflows/reusable-test.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,17 @@ jobs:
126126
if: ${{ runner.os == 'macOS' }}
127127
uses: XRPLF/actions/cleanup-workspace@cf0433aa74563aead044a1e395610c96d65a37cf
128128

129-
- name: Spin up scylladb
129+
- name: Delete and start colima (macOS)
130+
# This is a temporary workaround for colima issues on macOS runners
130131
if: ${{ runner.os == 'macOS' }}
131-
timeout-minutes: 3
132132
run: |
133-
docker rm --force scylladb || true
133+
colima delete --force
134+
colima start
135+
136+
- name: Spin up scylladb (macOS)
137+
if: ${{ runner.os == 'macOS' }}
138+
timeout-minutes: 1
139+
run: |
134140
docker run \
135141
--detach \
136142
--name scylladb \
@@ -142,8 +148,12 @@ jobs:
142148
--memory 16G \
143149
scylladb/scylla
144150
151+
- name: Wait for scylladb container to be healthy (macOS)
152+
if: ${{ runner.os == 'macOS' }}
153+
timeout-minutes: 1
154+
run: |
145155
until [ "$(docker inspect -f '{{.State.Health.Status}}' scylladb)" == "healthy" ]; do
146-
sleep 5
156+
sleep 1
147157
done
148158
149159
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0

.github/workflows/upload-conan-deps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
7979

8080
- name: Prepare runner
81-
uses: XRPLF/actions/prepare-runner@f05cab7b8541eee6473aa42beb9d2fe35608a190
81+
uses: XRPLF/actions/prepare-runner@e8d2d2a546a03e1d161dca52890705f3bc641215
8282
with:
8383
enable_ccache: false
8484

0 commit comments

Comments
 (0)