cleanup

Author: mmsqe

.github/workflows/tests-e2e-nix.yml

@@ -1,59 +1,100 @@
 name: E2E Nix Tests
 on:
-  push: 
-    branches:
-      - main
-      - release/**
+  push:
+    branches: [ main, release/** ]
   pull_request:
-    branches:
-      - main
-      - release/**
+    branches: [ main, release/** ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
-  integration_tests:
+  build-env:
     runs-on: ubuntu-latest
-    timeout-minutes: 240
-    strategy:
-      matrix:
-        tests: [all]
-    env:
-      TESTS_TO_RUN: ${{ matrix.tests }}
+    outputs:
+      run_tests: ${{ steps.set-run-tests.outputs.run_tests }}
     steps:
-      - name: Create more disk space
-        run: sudo rm -rf /usr/share/dotnet && sudo rm -rf /opt/ghc && sudo rm -rf "/usr/local/share/boost" && sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           fetch-depth: 1
+      - name: Skip marker (commit message)
+        run: |
+          msg="$(git log -1 --pretty=%B)"
+          if echo "$msg" | grep -qi '\[skip e2e\]'; then
+            echo "Skipping E2E by marker."
+            echo "run_tests=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
       - id: changed-files
-        uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
+        uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c
         with:
           files: |
-            docs
-            *.md
+            docs/**
             **/*.md
-      - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27
+      - id: set-run-tests
+        run: |
+          if [ "${{ steps.changed-files.outputs.only_changed }}" = "true" ]; then
+            echo "Docs-only change detected. Skipping tests."
+            echo "run_tests=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+          echo "run_tests=true" >> "$GITHUB_OUTPUT"
+      - name: Free disk space
+        if: steps.set-run-tests.outputs.run_tests == 'true'
+        run: sudo rm -rf /usr/share/dotnet /opt/ghc "/usr/local/share/boost" "$AGENT_TOOLSDIRECTORY" || true
+      - name: Install Nix
+        if: steps.set-run-tests.outputs.run_tests == 'true'
+        uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b
+        with:
+          nix_path: nixpkgs=channel:nixos-25.05
+          extra_nix_config: |
+            access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
+            sandbox = false
+      - name: Enable Magic Nix Cache
+        if: steps.set-run-tests.outputs.run_tests == 'true'
+        uses: DeterminateSystems/magic-nix-cache-action@main
+      - name: Pre-build dependencies (warm cache)
+        if: steps.set-run-tests.outputs.run_tests == 'true'
+        run: |
+          nix build .#evmd .#hermes || true
+  integration_tests:
+    needs: build-env
+    if: needs.build-env.outputs.run_tests == 'true'
+    runs-on: ubuntu-latest
+    timeout-minutes: 240
+    strategy:
+      fail-fast: true
+      matrix:
+        group: [all]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 1
+      - name: Install Nix
+        uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b
         with:
           nix_path: nixpkgs=channel:nixos-25.05
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
             sandbox = false
-        if: steps.changed-files.outputs.only_changed == 'false'
-      - uses: DeterminateSystems/magic-nix-cache-action@main
-        if: steps.changed-files.outputs.only_changed == 'false'
-      - name: Run integration tests
-        if: steps.changed-files.outputs.only_changed == 'false'
-        run: make test-e2e-nix
-      - name: 'Tar debug files'
+      - name: Enable Magic Nix Cache
+        uses: DeterminateSystems/magic-nix-cache-action@main
+      - name: Run test group via Makefile
+        env:
+          TESTS_TO_RUN: ${{ matrix.group }}
+        run: make test-e2e-nix TESTS_TO_RUN="${TESTS_TO_RUN}"
+      - name: Collect debug artifacts
         if: failure()
-        run: tar cfz debug_files.tar.gz -C "${TMPDIR-/tmp}/pytest-of-runner" .
-      - uses: actions/upload-artifact@v4
+        run: tar cfz debug_${{ matrix.group }}.tar.gz -C "${TMPDIR-/tmp}/pytest-of-runner" . || true
+      - name: Upload debug artifacts
         if: failure()
+        uses: actions/upload-artifact@v4
         with:
-          name: debug-files-${{ matrix.tests }}
-          path: debug_files.tar.gz
+          name: debug-${{ matrix.group }}
+          path: debug_${{ matrix.group }}.tar.gz
           if-no-files-found: ignore

flake.lock

@@ -2,11 +2,6 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/release-25.05";
     flake-utils.url = "github:numtide/flake-utils";
-    poetry2nix = {
-      url = "github:nix-community/poetry2nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-    };
     hermes = {
       url = "github:mmsqe/ibc-rs/ae80ab348952840696e6c9a0c7096d2de11ea579";
       flake = false;
@@ -18,7 +13,6 @@
       self,
       nixpkgs,
       flake-utils,
-      poetry2nix,
       hermes,
     }:
     let
@@ -56,7 +50,6 @@
     ))
     // {
       overlays.default = [
-        poetry2nix.overlays.default
         (final: super: {
           evmd = final.callPackage ./. { inherit rev; };
           hermes = final.callPackage ./tests/nix/hermes.nix { src = hermes; };

flake.nix

@@ -0,0 +1,18 @@
+#!/usr/bin/make -f
+
+TESTS_TO_RUN ?= all
+
+NIX_DEV_CMD = nix develop --accept-flake-config -c
+
+test-e2e-nix:
+	@echo "TESTS_TO_RUN=$(TESTS_TO_RUN)"
+	@bash scripts/restore_envs.sh
+	@CHAIN_CONFIG=$(CHAIN_CONFIG) TESTS_TO_RUN=$(TESTS_TO_RUN) bash scripts/run-integration-tests.sh
+
+dev:
+	@$(NIX_DEV_CMD) bash
+
+lint-py:
+	@cd integration_tests && uv run flake8 --show-source --count --statistics --format="::error file=%(path)s,line=%(row)d,col=%(col)d::%(path)s:%(row)d:%(col)d: %(code)s %(text)s"
+
+.PHONY: test-e2e-nix dev lint-py