From 985795e99d1018860e8930c1e56e8ec0a9eeedee Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Tue, 10 Oct 2023 21:09:45 -0400 Subject: [PATCH] Remove unused packages as part of build dependencies The reproducible runtime test failed due to running out of space. If we have multiple tests failing due to out of space, and all of our tests have these unused, it makes sense just to always so uninstall. Also extends the time limit of reproducible-runtime, as 2h has been hit a few times before. --- .github/actions/build-dependencies/action.yml | 3 +++ .github/workflows/full-stack-tests.yml | 21 +++---------------- tests/reproducible-runtime/src/lib.rs | 2 +- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/.github/actions/build-dependencies/action.yml b/.github/actions/build-dependencies/action.yml index 66c1e879d..344bdb588 100644 --- a/.github/actions/build-dependencies/action.yml +++ b/.github/actions/build-dependencies/action.yml @@ -20,6 +20,9 @@ inputs: runs: using: "composite" steps: + - name: Remove unused packages + run: sudo apt remove -y *powershell* *bazel* *nodejs* *npm* *yarn* *terraform* *firefox* *chromium* *qemu* *texinfo* *sqlite3* *imagemagick* && sudo apt autoremove -y + - name: Install Protobuf uses: arduino/setup-protoc@a8b67ba40b37d35169e222f3bb352603327985b6 with: diff --git a/.github/workflows/full-stack-tests.yml b/.github/workflows/full-stack-tests.yml index 7fd71a6b9..f764bc838 100644 --- a/.github/workflows/full-stack-tests.yml +++ b/.github/workflows/full-stack-tests.yml @@ -15,25 +15,10 @@ jobs: steps: - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac - # - name: Install Build Dependencies - # uses: ./.github/actions/build-dependencies - # with: - # github-token: ${{ inputs.github-token }} - - # Inlined build-dependencies action to minimize disk usage - - name: Install Protobuf - uses: arduino/setup-protoc@a8b67ba40b37d35169e222f3bb352603327985b6 - with: - repo-token: ${{ inputs.github-token }} - - - name: Install Rust - uses: dtolnay/rust-toolchain@5cb429dd810e16ff67df78472fa81cf760f4d1c0 + - name: Install Build Dependencies + uses: ./.github/actions/build-dependencies with: - toolchain: stable - targets: wasm32-unknown-unknown - - - name: Remove unused packages - run: sudo apt remove -y *powershell* *bazel* *nodejs* *npm* *yarn* *terraform* *firefox* *chromium* *texinfo* *sqlite3* *imagemagick* && sudo apt autoremove -y + 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/tests/reproducible-runtime/src/lib.rs b/tests/reproducible-runtime/src/lib.rs index 2648061dd..036faf796 100644 --- a/tests/reproducible-runtime/src/lib.rs +++ b/tests/reproducible-runtime/src/lib.rs @@ -7,7 +7,7 @@ pub fn reproducibly_builds() { use dockertest::{PullPolicy, Image, Composition, DockerTest}; const RUNS: usize = 3; - const TIMEOUT: u16 = 120 * 60; // 120 minutes + const TIMEOUT: u16 = 180 * 60; // 3 hours serai_docker_tests::build("runtime".to_string());