From 2b76e41c9abe94daad59cd0dc435f186966a008e Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Wed, 31 Jan 2024 19:21:26 -0500 Subject: [PATCH] Directly install protobuf-compiler without using an external action (#524) * Directly install protobuf-compiler without using an external action * Remove unused "github-token" input --- .github/actions/build-dependencies/action.yml | 14 +------------- .github/actions/test-dependencies/action.yml | 7 ------- .github/workflows/coins-tests.yml | 2 -- .github/workflows/common-tests.yml | 2 -- .github/workflows/coordinator-tests.yml | 2 -- .github/workflows/crypto-tests.yml | 2 -- .github/workflows/full-stack-tests.yml | 2 -- .github/workflows/lint.yml | 2 -- .github/workflows/message-queue-tests.yml | 2 -- .github/workflows/mini-tests.yml | 2 -- .github/workflows/monero-tests.yaml | 3 --- .github/workflows/no-std.yml | 2 -- .github/workflows/processor-tests.yml | 2 -- .github/workflows/reproducible-runtime.yml | 2 -- .github/workflows/tests.yml | 6 ------ 15 files changed, 1 insertion(+), 51 deletions(-) diff --git a/.github/actions/build-dependencies/action.yml b/.github/actions/build-dependencies/action.yml index 1d5adc07f..db0d7f523 100644 --- a/.github/actions/build-dependencies/action.yml +++ b/.github/actions/build-dependencies/action.yml @@ -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: @@ -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: | diff --git a/.github/actions/test-dependencies/action.yml b/.github/actions/test-dependencies/action.yml index d41f3e659..e4492dbb6 100644 --- a/.github/actions/test-dependencies/action.yml +++ b/.github/actions/test-dependencies/action.yml @@ -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 @@ -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 diff --git a/.github/workflows/coins-tests.yml b/.github/workflows/coins-tests.yml index 255003743..a0437c61a 100644 --- a/.github/workflows/coins-tests.yml +++ b/.github/workflows/coins-tests.yml @@ -25,8 +25,6 @@ jobs: - name: Test Dependencies uses: ./.github/actions/test-dependencies - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - name: Run Tests run: | diff --git a/.github/workflows/common-tests.yml b/.github/workflows/common-tests.yml index 17ce42465..0135fcaff 100644 --- a/.github/workflows/common-tests.yml +++ b/.github/workflows/common-tests.yml @@ -21,8 +21,6 @@ jobs: - name: Build Dependencies uses: ./.github/actions/build-dependencies - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - name: Run Tests run: | diff --git a/.github/workflows/coordinator-tests.yml b/.github/workflows/coordinator-tests.yml index cc1fd3794..cf32e9305 100644 --- a/.github/workflows/coordinator-tests.yml +++ b/.github/workflows/coordinator-tests.yml @@ -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 diff --git a/.github/workflows/crypto-tests.yml b/.github/workflows/crypto-tests.yml index 13f7a33ef..d9d1df08b 100644 --- a/.github/workflows/crypto-tests.yml +++ b/.github/workflows/crypto-tests.yml @@ -23,8 +23,6 @@ jobs: - name: Build Dependencies uses: ./.github/actions/build-dependencies - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - name: Run Tests run: | diff --git a/.github/workflows/full-stack-tests.yml b/.github/workflows/full-stack-tests.yml index f764bc838..3d1c86a19 100644 --- a/.github/workflows/full-stack-tests.yml +++ b/.github/workflows/full-stack-tests.yml @@ -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 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index fd26e4dd6..286dd73ff 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -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 diff --git a/.github/workflows/message-queue-tests.yml b/.github/workflows/message-queue-tests.yml index bdc5f233e..e6a5cfbf3 100644 --- a/.github/workflows/message-queue-tests.yml +++ b/.github/workflows/message-queue-tests.yml @@ -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 diff --git a/.github/workflows/mini-tests.yml b/.github/workflows/mini-tests.yml index 4ee6f64e0..9728e040f 100644 --- a/.github/workflows/mini-tests.yml +++ b/.github/workflows/mini-tests.yml @@ -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 diff --git a/.github/workflows/monero-tests.yaml b/.github/workflows/monero-tests.yaml index 511535b57..3f2127cef 100644 --- a/.github/workflows/monero-tests.yaml +++ b/.github/workflows/monero-tests.yaml @@ -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 @@ -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 diff --git a/.github/workflows/no-std.yml b/.github/workflows/no-std.yml index a92047a7e..79ea57670 100644 --- a/.github/workflows/no-std.yml +++ b/.github/workflows/no-std.yml @@ -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 diff --git a/.github/workflows/processor-tests.yml b/.github/workflows/processor-tests.yml index fa6db151a..f124cecea 100644 --- a/.github/workflows/processor-tests.yml +++ b/.github/workflows/processor-tests.yml @@ -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 diff --git a/.github/workflows/reproducible-runtime.yml b/.github/workflows/reproducible-runtime.yml index 6648d3e43..16256ab61 100644 --- a/.github/workflows/reproducible-runtime.yml +++ b/.github/workflows/reproducible-runtime.yml @@ -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 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8e0e7e3ee..257c1dd56 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -33,8 +33,6 @@ jobs: - name: Build Dependencies uses: ./.github/actions/build-dependencies - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - name: Run Tests run: | @@ -54,8 +52,6 @@ jobs: - name: Build Dependencies uses: ./.github/actions/build-dependencies - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - name: Run Tests run: | @@ -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