From f6c092baa8ba21817958d7da53a187a21511a4a8 Mon Sep 17 00:00:00 2001 From: vindard <17693119+vindard@users.noreply.github.com> Date: Fri, 9 Feb 2024 09:24:17 -0400 Subject: [PATCH 1/4] ci: separate buck2 build step --- .github/workflows/buck2-test.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/buck2-test.yaml b/.github/workflows/buck2-test.yaml index f072fc87cb..7b5184302b 100644 --- a/.github/workflows/buck2-test.yaml +++ b/.github/workflows/buck2-test.yaml @@ -47,6 +47,9 @@ jobs: echo "Prepared args: $ARGS" echo "args=$ARGS" >> "$GITHUB_OUTPUT" + - name: Buck2 build + if: steps.prepare_args.outputs.args != '' + run: nix develop -c buck2 build ${{ steps.prepare_args.outputs.args }} - name: Buck2 test if: steps.prepare_args.outputs.args != '' run: nix develop -c buck2 test ${{ steps.prepare_args.outputs.args }} From a31e0084eefbd49fe8881ebe1760ab8fb7d919af Mon Sep 17 00:00:00 2001 From: vindard <17693119+vindard@users.noreply.github.com> Date: Fri, 9 Feb 2024 09:27:58 -0400 Subject: [PATCH 2/4] ci: edit names and steps for buck2 job --- .github/workflows/bats.yml | 4 ++-- ...buck2-test.yaml => check-code-and-unit-test.yaml} | 12 ++++++------ .github/workflows/integration-test.yml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) rename .github/workflows/{buck2-test.yaml => check-code-and-unit-test.yaml} (89%) diff --git a/.github/workflows/bats.yml b/.github/workflows/bats.yml index 8b5df6699f..bc56827cc9 100644 --- a/.github/workflows/bats.yml +++ b/.github/workflows/bats.yml @@ -5,8 +5,8 @@ on: branches: [main] jobs: - integration: - name: Bats tests + tests: + name: execute via bats runs-on: ubuntu-latest timeout-minutes: 20 steps: diff --git a/.github/workflows/buck2-test.yaml b/.github/workflows/check-code-and-unit-test.yaml similarity index 89% rename from .github/workflows/buck2-test.yaml rename to .github/workflows/check-code-and-unit-test.yaml index 7b5184302b..d4f1f366d9 100644 --- a/.github/workflows/buck2-test.yaml +++ b/.github/workflows/check-code-and-unit-test.yaml @@ -1,12 +1,12 @@ -name: Buck2 test +name: Check Code & Unit Test on: pull_request: branches: [main] types: [opened, synchronize, labeled, unlabeled] jobs: - buck2-test: - name: Buck2 Test + tests: + name: execute via buck2 runs-on: ubuntu-latest steps: - name: Install Nix @@ -14,7 +14,7 @@ jobs: - name: Run the Magic Nix Cache uses: DeterminateSystems/magic-nix-cache-action@v2 - uses: actions/checkout@v3 - - name: Prepare Buck2 test args from labels + - name: Prepare buck2 test args from labels id: prepare_args run: | ARGS="" @@ -47,9 +47,9 @@ jobs: echo "Prepared args: $ARGS" echo "args=$ARGS" >> "$GITHUB_OUTPUT" - - name: Buck2 build + - name: Build via buck2 if: steps.prepare_args.outputs.args != '' run: nix develop -c buck2 build ${{ steps.prepare_args.outputs.args }} - - name: Buck2 test + - name: Run checks and tests via buck2 if: steps.prepare_args.outputs.args != '' run: nix develop -c buck2 test ${{ steps.prepare_args.outputs.args }} diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index cf39a00ff4..5bdb264286 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -6,7 +6,7 @@ on: jobs: tests: - name: Integration test + name: execute via tilt runs-on: ubuntu-latest steps: - name: Maximize build space From a3581a916121b0917be9856dc94611984494a7b0 Mon Sep 17 00:00:00 2001 From: vindard <17693119+vindard@users.noreply.github.com> Date: Fri, 9 Feb 2024 09:47:44 -0400 Subject: [PATCH 3/4] ci: edit names and steps for bats job --- .github/workflows/{bats.yml => e2e-test.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{bats.yml => e2e-test.yml} (98%) diff --git a/.github/workflows/bats.yml b/.github/workflows/e2e-test.yml similarity index 98% rename from .github/workflows/bats.yml rename to .github/workflows/e2e-test.yml index bc56827cc9..4f8bc902ea 100644 --- a/.github/workflows/bats.yml +++ b/.github/workflows/e2e-test.yml @@ -1,4 +1,4 @@ -name: "Bats test" +name: "E2e test" on: pull_request: From 1a5817a6aebfea2a8aa7b028a72484235a620bb3 Mon Sep 17 00:00:00 2001 From: vindard <17693119+vindard@users.noreply.github.com> Date: Fri, 9 Feb 2024 09:57:34 -0400 Subject: [PATCH 4/4] ci: maximize disk space for code checks and tests action --- .github/workflows/check-code-and-unit-test.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/check-code-and-unit-test.yaml b/.github/workflows/check-code-and-unit-test.yaml index d4f1f366d9..f62dd68c40 100644 --- a/.github/workflows/check-code-and-unit-test.yaml +++ b/.github/workflows/check-code-and-unit-test.yaml @@ -9,6 +9,11 @@ jobs: name: execute via buck2 runs-on: ubuntu-latest steps: + - name: Maximize build space + uses: easimon/maximize-build-space@master + with: + root-reserve-mb: 12288 + temp-reserve-mb: 12288 - name: Install Nix uses: DeterminateSystems/nix-installer-action@v4 - name: Run the Magic Nix Cache