From 18a1d15f78f05cf95cb3350393a9e8991a1fca60 Mon Sep 17 00:00:00 2001
From: Luke Parker <lukeparker5132@gmail.com>
Date: Sat, 23 Jul 2022 06:05:31 -0500
Subject: [PATCH] Use composite actions in CI (#65)
* Attempt composite actions in CI
* Remove needs monero-daemon for the action
* Correct actions folder layout
* Remove empty inputs/outputs, add shell
* Try moving env declaration spot
* Remove usage of env
* Cached Rust composite action
* Replace [] with ""
Remove empty outputs
---
.github/actions/build-dependencies/action.yml | 25 +++++
.github/actions/cached-rust/action.yml | 32 ++++++
.github/actions/monero/action.yml | 38 +++++++
.github/workflows/tests.yml | 100 ++----------------
4 files changed, 103 insertions(+), 92 deletions(-)
create mode 100644 .github/actions/build-dependencies/action.yml
create mode 100644 .github/actions/cached-rust/action.yml
create mode 100644 .github/actions/monero/action.yml
diff --git a/.github/actions/build-dependencies/action.yml b/.github/actions/build-dependencies/action.yml
new file mode 100644
index 00000000..6e75a7f6
--- /dev/null
+++ b/.github/actions/build-dependencies/action.yml
@@ -0,0 +1,25 @@
+name: build-dependencies
+description: Installs build dependencies for Serai
+
+runs:
+ using: "composite"
+ steps:
+ - name: Install solc
+ shell: bash
+ run: |
+ pip3 install solc-select
+ solc-select install 0.8.9
+ solc-select use 0.8.9
+
+ - name: Install Monero Dependencies
+ shell: bash
+ run: |
+ sudo apt update
+ sudo apt install build-essential libboost-all-dev libsodium-dev
+
+ - name: Install WASM toolchain
+ uses: actions-rs/toolchain@v1
+ with:
+ toolchain: nightly
+ profile: minimal
+ target: wasm32-unknown-unknown
diff --git a/.github/actions/cached-rust/action.yml b/.github/actions/cached-rust/action.yml
new file mode 100644
index 00000000..a86eb866
--- /dev/null
+++ b/.github/actions/cached-rust/action.yml
@@ -0,0 +1,32 @@
+name: cached-rust
+description: Installs Rust, caching ~/.cargo and ./target
+
+inputs:
+ toolchain:
+ description: "Toolchain to install"
+ required: false
+ default: stable
+
+ components:
+ description: "Components to install"
+ required: false
+ default:
+
+runs:
+ using: "composite"
+ steps:
+ - name: Rust cache
+ uses: actions/cache@v3
+ with:
+ path: |
+ ~/.cargo
+ ./target
+ key: ${{ runner.os }}-${{ runner.arch }}-rust-${{ inputs.toolchain }}
+
+ - name: Install Rust
+ uses: actions-rs/toolchain@v1
+ with:
+ toolchain: ${{ inputs.toolchain }}
+ profile: minimal
+ default: true
+ components: ${{ inputs.components }}
diff --git a/.github/actions/monero/action.yml b/.github/actions/monero/action.yml
new file mode 100644
index 00000000..6a5b3217
--- /dev/null
+++ b/.github/actions/monero/action.yml
@@ -0,0 +1,38 @@
+name: monero-regtest
+description: Spawns a regtest Monero daemon
+
+runs:
+ using: "composite"
+ steps:
+ - name: Monero daemon cache
+ id: cache-monerod
+ uses: actions/cache@v3
+ with:
+ path: monerod
+ key: monerod-${{ runner.os }}-${{ runner.arch }}-v0.17.3.2
+
+ - name: Download the Monero Daemon
+ if: steps.cache-monerod.outputs.cache-hit != 'true'
+ # Calculates OS/ARCH to demonstrate it, yet then locks to linux-x64 due
+ # to the contained folder not following the same naming scheme and
+ # requiring further expansion not worth doing right now
+ shell: bash
+ run: |
+ RUNNER_OS=${{ runner.os }}
+ RUNNER_ARCH=${{ runner.arch }}
+
+ RUNNER_OS=${RUNNER_OS,,}
+ RUNNER_ARCH=${RUNNER_ARCH,,}
+
+ RUNNER_OS=linux
+ RUNNER_ARCH=x64
+
+ FILE=monero-$RUNNER_OS-$RUNNER_ARCH-v0.17.3.2.tar.bz2
+ wget https://downloads.getmonero.org/cli/$FILE
+ tar -xvf $FILE
+
+ mv monero-x86_64-linux-gnu-v0.17.3.2/monerod monerod
+
+ - name: Monero Regtest Daemon
+ shell: bash
+ run: ./monerod --regtest --offline --fixed-difficulty=1 --detach
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f27e7637..2f113bc1 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -7,31 +7,6 @@ on:
pull_request:
jobs:
- monero-daemon:
- runs-on: ubuntu-latest
- steps:
- - name: Monero cache
- id: cache-monerod
- uses: actions/cache@v3
- with:
- path: monerod
- key: monerod-${{ runner.os }}-${{ runner.arch }}-v0.17.3.2
-
- - name: Download the Monero Daemon
- if: steps.cache-monerod.outputs.cache-hit != 'true'
- # Calculates OS/ARCH to demonstrate it, yet then locks to linux-x64 due
- # to the contained folder not following the same naming scheme and
- # requiring further expansion not worth doing right now
- run: |
- RUNNER_OS=${{ runner.os }}
- RUNNER_ARCH=${{ runner.arch }}
- OS_ARCH=${RUNNER_OS,,}-${RUNNER_ARCH,,}
- OS_ARCH=linux-x64
-
- wget https://downloads.getmonero.org/cli/monero-$OS_ARCH-v0.17.3.2.tar.bz2
- tar -xvf monero-$OS_ARCH-v0.17.3.2.tar.bz2
- mv monero-x86_64-linux-gnu-v0.17.3.2/monerod monerod
-
clippy:
runs-on: ubuntu-latest
steps:
@@ -39,99 +14,39 @@ jobs:
with:
submodules: "recursive"
- - name: Install solc
- run: |
- pip3 install solc-select
- solc-select install 0.8.9
- solc-select use 0.8.9
-
- - name: Install Monero Dependencies
- run: |
- sudo apt update
- sudo apt install build-essential libboost-all-dev libsodium-dev
+ - name: Build Dependencies
+ uses: ./.github/actions/build-dependencies
- name: Install Rust
- uses: actions-rs/toolchain@v1
+ uses: ./.github/actions/cached-rust
with:
# Clippy requires nightly for some reason
toolchain: nightly
- profile: minimal
- default: true
components: clippy
- - name: Install WASM toolchain
- uses: actions-rs/toolchain@v1
- with:
- toolchain: nightly
- profile: minimal
- target: wasm32-unknown-unknown
-
- # Define a separate cache for nightly Rust
- - name: Cargo/Rust nightly cache
- uses: actions/cache@v3
- with:
- path: |
- ~/.cargo
- ./target
- key: ${{ runner.os }}-cargo-rust-nightly
-
- name: Run Clippy
run: cargo clippy --all-features -- -D warnings -A clippy::type_complexity -A dead_code
test:
runs-on: ubuntu-latest
- needs: monero-daemon
steps:
- uses: actions/checkout@v3
with:
submodules: "recursive"
- - name: Install solc
- run: |
- pip3 install solc-select
- solc-select install 0.8.9
- solc-select use 0.8.9
+ - name: Build Dependencies
+ uses: ./.github/actions/build-dependencies
- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
with:
version: nightly
- - name: Install Monero Dependencies
- run: |
- sudo apt update
- sudo apt install build-essential libboost-all-dev libsodium-dev
-
- - name: Monero cache
- uses: actions/cache@v3
- with:
- path: monerod
- key: monerod-${{ runner.os }}-${{ runner.arch }}-v0.17.3.2
-
- name: Monero Regtest Daemon
- run: ./monerod --regtest --offline --fixed-difficulty=1 --detach
+ uses: ./.github/actions/monero
- name: Install Rust
- uses: actions-rs/toolchain@v1
- with:
- toolchain: stable
- profile: minimal
- default: true
-
- - name: Install WASM toolchain
- uses: actions-rs/toolchain@v1
- with:
- toolchain: nightly
- profile: minimal
- target: wasm32-unknown-unknown
-
- - name: Cargo/Rust cache
- uses: actions/cache@v3
- with:
- path: |
- ~/.cargo
- ./target
- key: ${{ runner.os }}-cargo-rust
+ uses: ./.github/actions/cached-rust
- name: Run tests
run: cargo test --all-features
@@ -141,6 +56,7 @@ jobs:
steps:
- uses: actions/checkout@v3
+ # Doesn't grab the cache because it doesn't need it
- name: Install rustfmt
uses: actions-rs/toolchain@v1
with: