Skip to content

Commit

Permalink
Directly install protobuf-compiler without using an external action (#…
Browse files Browse the repository at this point in the history
…524)

* Directly install protobuf-compiler without using an external action

* Remove unused "github-token" input
  • Loading branch information
kayabaNerve authored Feb 1, 2024
1 parent 05219c3 commit 2b76e41
Show file tree
Hide file tree
Showing 15 changed files with 1 addition and 51 deletions.
14 changes: 1 addition & 13 deletions .github/actions/build-dependencies/action.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
name: build-dependencies
description: Installs build dependencies for Serai

inputs:
github-token:
description: "GitHub token to install Protobuf with"
require: true
default:

runs:
using: "composite"
steps:
Expand All @@ -26,17 +20,11 @@ runs:
shell: bash
run: |
if [ "$RUNNER_OS" == "Linux" ]; then
sudo apt install -y ca-certificates
sudo apt install -y ca-certificates protobuf-compiler
elif [ "$RUNNER_OS" == "Windows" ]; then
choco install protoc
fi
- name: Install Protobuf
uses: arduino/setup-protoc@a8b67ba40b37d35169e222f3bb352603327985b6
with:
repo-token: ${{ inputs.github-token }}
if: runner.os == 'Linux'

- name: Install solc
shell: bash
run: |
Expand Down
7 changes: 0 additions & 7 deletions .github/actions/test-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@ name: test-dependencies
description: Installs test dependencies for Serai

inputs:
github-token:
description: "GitHub token to install Protobuf with"
require: true
default:

monero-version:
description: "Monero version to download and run as a regtest node"
required: false
Expand All @@ -22,8 +17,6 @@ runs:
steps:
- name: Install Build Dependencies
uses: ./.github/actions/build-dependencies
with:
github-token: ${{ inputs.github-token }}

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@cb603ca0abb544f301eaed59ac0baf579aa6aecf
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/coins-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ jobs:

- name: Test Dependencies
uses: ./.github/actions/test-dependencies
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Run Tests
run: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/common-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:

- name: Build Dependencies
uses: ./.github/actions/build-dependencies
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Run Tests
run: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/coordinator-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ jobs:

- name: Install Build Dependencies
uses: ./.github/actions/build-dependencies
with:
github-token: ${{ inputs.github-token }}

- name: Run coordinator Docker tests
run: cd tests/coordinator && GITHUB_CI=true RUST_BACKTRACE=1 cargo test
2 changes: 0 additions & 2 deletions .github/workflows/crypto-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ jobs:

- name: Build Dependencies
uses: ./.github/actions/build-dependencies
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Run Tests
run: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/full-stack-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ jobs:

- name: Install Build Dependencies
uses: ./.github/actions/build-dependencies
with:
github-token: ${{ inputs.github-token }}

- name: Run Full Stack Docker tests
run: cd tests/full-stack && GITHUB_CI=true RUST_BACKTRACE=1 cargo test
2 changes: 0 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ jobs:

- name: Build Dependencies
uses: ./.github/actions/build-dependencies
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Install nightly rust
run: rustup toolchain install ${{ steps.nightly.outputs.version }} --profile minimal -t wasm32-unknown-unknown -c clippy
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/message-queue-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ jobs:

- name: Install Build Dependencies
uses: ./.github/actions/build-dependencies
with:
github-token: ${{ inputs.github-token }}

- name: Run message-queue Docker tests
run: cd tests/message-queue && GITHUB_CI=true RUST_BACKTRACE=1 cargo test
2 changes: 0 additions & 2 deletions .github/workflows/mini-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:

- name: Build Dependencies
uses: ./.github/actions/build-dependencies
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Run Tests
run: GITHUB_CI=true RUST_BACKTRACE=1 cargo test --all-features -p mini-serai
3 changes: 0 additions & 3 deletions .github/workflows/monero-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ jobs:

- name: Test Dependencies
uses: ./.github/actions/test-dependencies
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Run Unit Tests Without Features
run: GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-serai --lib
Expand All @@ -45,7 +43,6 @@ jobs:
- name: Test Dependencies
uses: ./.github/actions/test-dependencies
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
monero-version: ${{ matrix.version }}

- name: Run Integration Tests Without Features
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/no-std.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ jobs:

- name: Install Build Dependencies
uses: ./.github/actions/build-dependencies
with:
github-token: ${{ inputs.github-token }}

- name: Install RISC-V Toolchain
run: sudo apt update && sudo apt install -y gcc-riscv64-unknown-elf gcc-multilib && rustup target add riscv32imac-unknown-none-elf
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/processor-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ jobs:

- name: Install Build Dependencies
uses: ./.github/actions/build-dependencies
with:
github-token: ${{ inputs.github-token }}

- name: Run processor Docker tests
run: cd tests/processor && GITHUB_CI=true RUST_BACKTRACE=1 cargo test
2 changes: 0 additions & 2 deletions .github/workflows/reproducible-runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ jobs:

- name: Install Build Dependencies
uses: ./.github/actions/build-dependencies
with:
github-token: ${{ inputs.github-token }}

- name: Run Reproducible Runtime tests
run: cd tests/reproducible-runtime && GITHUB_CI=true RUST_BACKTRACE=1 cargo test
6 changes: 0 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ jobs:

- name: Build Dependencies
uses: ./.github/actions/build-dependencies
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Run Tests
run: |
Expand All @@ -54,8 +52,6 @@ jobs:

- name: Build Dependencies
uses: ./.github/actions/build-dependencies
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Run Tests
run: |
Expand All @@ -79,8 +75,6 @@ jobs:

- name: Build Dependencies
uses: ./.github/actions/build-dependencies
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Run Tests
run: GITHUB_CI=true RUST_BACKTRACE=1 cargo test --all-features -p serai-client

0 comments on commit 2b76e41

Please sign in to comment.