Skip to content

Commit 8522840

Browse files
dannywillemsdannywillems
committed
CI: remove OCaml setup
1 parent 2a511d9 commit 8522840

File tree

9 files changed

+2
-92
lines changed

9 files changed

+2
-92
lines changed

‎.github/actions/load-versions/action.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ outputs:
1111
rust-nightly:
1212
description: "Rust nightly version"
1313
value: ${{ steps.load.outputs.rust-nightly }}
14-
ocaml-version:
15-
description: "OCaml version"
16-
value: ${{ steps.load.outputs.ocaml-version }}
1714
node-version:
1815
description: "Node.js version"
1916
value: ${{ steps.load.outputs.node-version }}
@@ -31,7 +28,6 @@ runs:
3128
RUST_STABLE=$(yq eval '.rust.stable' "$VERSIONS_FILE")
3229
RUST_BETA=$(yq eval '.rust.beta' "$VERSIONS_FILE")
3330
RUST_NIGHTLY=$(yq eval '.rust.nightly' "$VERSIONS_FILE")
34-
OCAML_VERSION=$(yq eval '.ocaml.version' "$VERSIONS_FILE")
3531
NODE_VERSION_YAML=$(yq eval '.node.version' "$VERSIONS_FILE")
3632
3733
# Read node version from .nvmrc
@@ -49,19 +45,16 @@ runs:
4945
echo "rust-stable=$RUST_STABLE" >> $GITHUB_OUTPUT
5046
echo "rust-beta=$RUST_BETA" >> $GITHUB_OUTPUT
5147
echo "rust-nightly=$RUST_NIGHTLY" >> $GITHUB_OUTPUT
52-
echo "ocaml-version=$OCAML_VERSION" >> $GITHUB_OUTPUT
5348
echo "node-version=$NODE_VERSION_YAML" >> $GITHUB_OUTPUT
5449
5550
# Also set as environment variables for convenience
5651
echo "RUST_STABLE_VERSION=$RUST_STABLE" >> $GITHUB_ENV
5752
echo "RUST_BETA_VERSION=$RUST_BETA" >> $GITHUB_ENV
5853
echo "RUST_NIGHTLY_VERSION=$RUST_NIGHTLY" >> $GITHUB_ENV
59-
echo "OCAML_VERSION=$OCAML_VERSION" >> $GITHUB_ENV
6054
echo "NODE_VERSION=$NODE_VERSION_YAML" >> $GITHUB_ENV
6155
6256
echo "Loaded versions:"
6357
echo " Rust stable: $RUST_STABLE"
6458
echo " Rust beta: $RUST_BETA"
6559
echo " Rust nightly: $RUST_NIGHTLY"
66-
echo " OCaml: $OCAML_VERSION"
6760
echo " Node.js: $NODE_VERSION_YAML"

‎.github/actions/setup-build-deps/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ runs:
1919
if: runner.os == 'macOS'
2020
shell: bash
2121
run: |
22-
brew install protobuf ocaml opam libpcap
22+
brew install protobuf libpcap
2323
2424
- name: Install cargo-nextest
2525
if: inputs.install-nextest == 'true'

‎.github/actions/setup-ocaml/action.yml‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎.github/workflows/build-reusable.yaml‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ jobs:
4646
- name: Setup build dependencies
4747
uses: ./.github/actions/setup-build-deps
4848

49-
- name: Use shared OCaml setting up steps
50-
uses: ./.github/actions/setup-ocaml
51-
with:
52-
ocaml_version: ${{ env.OCAML_VERSION }}
53-
5449
- name: Setup Rust
5550
uses: ./.github/actions/setup-rust
5651
with:
@@ -92,11 +87,6 @@ jobs:
9287
- name: Setup build dependencies
9388
uses: ./.github/actions/setup-build-deps
9489

95-
- name: Use shared OCaml setting up steps
96-
uses: ./.github/actions/setup-ocaml
97-
with:
98-
ocaml_version: ${{ env.OCAML_VERSION }}
99-
10090
- name: Setup Rust
10191
uses: ./.github/actions/setup-rust
10292
with:
@@ -121,11 +111,6 @@ jobs:
121111
- name: Setup build dependencies
122112
uses: ./.github/actions/setup-build-deps
123113

124-
- name: Use shared OCaml setting up steps
125-
uses: ./.github/actions/setup-ocaml
126-
with:
127-
ocaml_version: ${{ env.OCAML_VERSION }}
128-
129114
- name: Setup Rust
130115
uses: ./.github/actions/setup-rust
131116
with:
@@ -151,11 +136,6 @@ jobs:
151136
- name: Setup build dependencies
152137
uses: ./.github/actions/setup-build-deps
153138

154-
- name: Use shared OCaml setting up steps
155-
uses: ./.github/actions/setup-ocaml
156-
with:
157-
ocaml_version: ${{ env.OCAML_VERSION }}
158-
159139
- name: Setup Rust
160140
uses: ./.github/actions/setup-rust
161141
with:
@@ -179,11 +159,6 @@ jobs:
179159
- name: Setup build dependencies
180160
uses: ./.github/actions/setup-build-deps
181161

182-
- name: Use shared OCaml setting up steps
183-
uses: ./.github/actions/setup-ocaml
184-
with:
185-
ocaml_version: ${{ env.OCAML_VERSION }}
186-
187162
- name: Setup WebAssembly environment
188163
uses: ./.github/actions/setup-wasm
189164
with:

‎.github/workflows/doc-commands.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ jobs:
3434
toolchain: ${{ env.RUST_STABLE_VERSION }}
3535
cache-prefix: test-doc-commands-v0
3636

37-
- name: Use shared OCaml setting up steps
38-
uses: ./.github/actions/setup-ocaml
39-
with:
40-
ocaml_version: ${{ env.OCAML_VERSION }}
41-
4237
- name: Download circuits files
4338
uses: ./.github/actions/setup-circuits
4439

‎.github/workflows/docs.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Setup build dependencies
3636
run: |
3737
sudo apt update
38-
sudo apt install -y protobuf-compiler ocaml
38+
sudo apt install -y protobuf-compiler
3939
4040
- name: Install documentation dependencies
4141
run: make docs-install

‎.github/workflows/lint-beta.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ jobs:
2727
- name: Setup build dependencies
2828
uses: ./.github/actions/setup-build-deps
2929

30-
- name: Use shared OCaml setting up steps
31-
uses: ./.github/actions/setup-ocaml
32-
with:
33-
ocaml_version: ${{ env.OCAML_VERSION }}
34-
3530
- name: Setup Rust (Beta)
3631
uses: ./.github/actions/setup-rust
3732
with:

‎.github/workflows/lint.yaml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ jobs:
2222
- name: Setup build dependencies
2323
uses: ./.github/actions/setup-build-deps
2424

25-
- name: Use shared OCaml setting up steps
26-
uses: ./.github/actions/setup-ocaml
27-
with:
28-
ocaml_version: ${{ env.OCAML_VERSION }}
29-
3025
- name: Setup Rust
3126
uses: ./.github/actions/setup-rust
3227
with:
@@ -56,11 +51,6 @@ jobs:
5651
- name: Setup build dependencies
5752
uses: ./.github/actions/setup-build-deps
5853

59-
- name: Use shared OCaml setting up steps
60-
uses: ./.github/actions/setup-ocaml
61-
with:
62-
ocaml_version: ${{ env.OCAML_VERSION }}
63-
6454
- name: Setup Rust
6555
uses: ./.github/actions/setup-rust
6656
with:

‎.github/workflows/tests.yaml‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@ jobs:
5050
- name: Setup build dependencies
5151
uses: ./.github/actions/setup-build-deps
5252

53-
- name: Use shared OCaml setting up steps
54-
uses: ./.github/actions/setup-ocaml
55-
with:
56-
ocaml_version: ${{ env.OCAML_VERSION }}
57-
5853
- name: Setup Rust
5954
uses: ./.github/actions/setup-rust
6055
with:
@@ -186,11 +181,6 @@ jobs:
186181
- name: Setup build dependencies
187182
uses: ./.github/actions/setup-build-deps
188183

189-
- name: Use shared OCaml setting up steps
190-
uses: ./.github/actions/setup-ocaml
191-
with:
192-
ocaml_version: ${{ env.OCAML_VERSION }}
193-
194184
- name: Setup Rust
195185
uses: ./.github/actions/setup-rust
196186
with:
@@ -361,11 +351,6 @@ jobs:
361351
- name: Setup build dependencies
362352
uses: ./.github/actions/setup-build-deps
363353

364-
- name: Use shared OCaml setting up steps
365-
uses: ./.github/actions/setup-ocaml
366-
with:
367-
ocaml_version: ${{ env.OCAML_VERSION }}
368-
369354
- name: Setup Rust
370355
uses: ./.github/actions/setup-rust
371356
with:
@@ -395,11 +380,6 @@ jobs:
395380
- name: Setup build dependencies
396381
uses: ./.github/actions/setup-build-deps
397382

398-
- name: Use shared OCaml setting up steps
399-
uses: ./.github/actions/setup-ocaml
400-
with:
401-
ocaml_version: ${{ env.OCAML_VERSION }}
402-
403383
- name: Setup Rust
404384
uses: ./.github/actions/setup-rust
405385
with:
@@ -457,11 +437,6 @@ jobs:
457437
- name: Setup build dependencies
458438
uses: ./.github/actions/setup-build-deps
459439

460-
- name: Use shared OCaml setting up steps
461-
uses: ./.github/actions/setup-ocaml
462-
with:
463-
ocaml_version: ${{ env.OCAML_VERSION }}
464-
465440
- name: Setup Rust
466441
uses: ./.github/actions/setup-rust
467442
with:

0 commit comments

Comments
 (0)