diff --git a/.github/assets/check_rv32imac.sh b/.github/scripts/check_rv32imac.sh similarity index 100% rename from .github/assets/check_rv32imac.sh rename to .github/scripts/check_rv32imac.sh diff --git a/.github/assets/check_wasm.sh b/.github/scripts/check_wasm.sh similarity index 100% rename from .github/assets/check_wasm.sh rename to .github/scripts/check_wasm.sh diff --git a/.github/assets/hive/Dockerfile b/.github/scripts/hive/Dockerfile similarity index 100% rename from .github/assets/hive/Dockerfile rename to .github/scripts/hive/Dockerfile diff --git a/.github/assets/hive/build_simulators.sh b/.github/scripts/hive/build_simulators.sh similarity index 97% rename from .github/assets/hive/build_simulators.sh rename to .github/scripts/hive/build_simulators.sh index d65e609e70..81fed98e87 100755 --- a/.github/assets/hive/build_simulators.sh +++ b/.github/scripts/hive/build_simulators.sh @@ -38,6 +38,6 @@ for pid in "${saving_pids[@]}"; do done # Make sure we don't rebuild images on the CI jobs -git apply ../.github/assets/hive/no_sim_build.diff +git apply ../.github/scripts/hive/no_sim_build.diff go build . mv ./hive ../hive_assets/ diff --git a/.github/assets/hive/expected_failures.yaml b/.github/scripts/hive/expected_failures.yaml similarity index 100% rename from .github/assets/hive/expected_failures.yaml rename to .github/scripts/hive/expected_failures.yaml diff --git a/.github/assets/hive/ignored_tests.yaml b/.github/scripts/hive/ignored_tests.yaml similarity index 100% rename from .github/assets/hive/ignored_tests.yaml rename to .github/scripts/hive/ignored_tests.yaml diff --git a/.github/assets/hive/load_images.sh b/.github/scripts/hive/load_images.sh similarity index 100% rename from .github/assets/hive/load_images.sh rename to .github/scripts/hive/load_images.sh diff --git a/.github/assets/hive/no_sim_build.diff b/.github/scripts/hive/no_sim_build.diff similarity index 100% rename from .github/assets/hive/no_sim_build.diff rename to .github/scripts/hive/no_sim_build.diff diff --git a/.github/assets/hive/parse.py b/.github/scripts/hive/parse.py similarity index 100% rename from .github/assets/hive/parse.py rename to .github/scripts/hive/parse.py diff --git a/.github/assets/hive/run_simulator.sh b/.github/scripts/hive/run_simulator.sh similarity index 100% rename from .github/assets/hive/run_simulator.sh rename to .github/scripts/hive/run_simulator.sh diff --git a/.github/assets/install_geth.sh b/.github/scripts/install_geth.sh similarity index 100% rename from .github/assets/install_geth.sh rename to .github/scripts/install_geth.sh diff --git a/.github/assets/label_pr.js b/.github/scripts/label_pr.js similarity index 100% rename from .github/assets/label_pr.js rename to .github/scripts/label_pr.js diff --git a/.github/workflows/hive.yml b/.github/workflows/hive.yml index e94042d6b9..16492194d9 100644 --- a/.github/workflows/hive.yml +++ b/.github/workflows/hive.yml @@ -58,11 +58,11 @@ jobs: uses: actions/cache@v5 with: path: ./hive_assets - key: hive-assets-${{ steps.hive-commit.outputs.hash }}-${{ hashFiles('.github/assets/hive/build_simulators.sh') }} + key: hive-assets-${{ steps.hive-commit.outputs.hash }}-${{ hashFiles('.github/scripts/hive/build_simulators.sh') }} - name: Build hive assets if: steps.cache-hive.outputs.cache-hit != 'true' - run: .github/assets/hive/build_simulators.sh + run: .github/scripts/hive/build_simulators.sh - name: Load cached Docker images if: steps.cache-hive.outputs.cache-hit == 'true' @@ -213,7 +213,7 @@ jobs: path: /tmp - name: Load Docker images - run: .github/assets/hive/load_images.sh + run: .github/scripts/hive/load_images.sh - name: Move hive binary run: | @@ -241,11 +241,11 @@ jobs: FILTER="/" fi echo "filter: $FILTER" - .github/assets/hive/run_simulator.sh "${{ matrix.scenario.sim }}" "$FILTER" + .github/scripts/hive/run_simulator.sh "${{ matrix.scenario.sim }}" "$FILTER" - name: Parse hive output run: | - find hivetests/workspace/logs -type f -name "*.json" ! -name "hive.json" | xargs -I {} python .github/assets/hive/parse.py {} --exclusion .github/assets/hive/expected_failures.yaml --ignored .github/assets/hive/ignored_tests.yaml + find hivetests/workspace/logs -type f -name "*.json" ! -name "hive.json" | xargs -I {} python .github/scripts/hive/parse.py {} --exclusion .github/scripts/hive/expected_failures.yaml --ignored .github/scripts/hive/ignored_tests.yaml - name: Print simulator output if: ${{ failure() }} diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 46f5670c72..facd449f5a 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -36,7 +36,7 @@ jobs: - uses: rui314/setup-mold@v1 - uses: dtolnay/rust-toolchain@stable - name: Install Geth - run: .github/assets/install_geth.sh + run: .github/scripts/install_geth.sh - uses: taiki-e/install-action@nextest - uses: mozilla-actions/sccache-action@v0.0.9 - uses: Swatinem/rust-cache@v2 diff --git a/.github/workflows/label-pr.yml b/.github/workflows/label-pr.yml index 7211f383a8..616e53295a 100644 --- a/.github/workflows/label-pr.yml +++ b/.github/workflows/label-pr.yml @@ -19,5 +19,5 @@ jobs: uses: actions/github-script@v8 with: script: | - const label_pr = require('./.github/assets/label_pr.js') + const label_pr = require('./.github/scripts/label_pr.js') await label_pr({github, context}) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index bc2ab5bdde..80d2af3fce 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -76,7 +76,7 @@ jobs: - name: Run Wasm checks run: | sudo apt update && sudo apt install gcc-multilib - .github/assets/check_wasm.sh + .github/scripts/check_wasm.sh riscv: runs-on: depot-ubuntu-latest @@ -94,7 +94,7 @@ jobs: cache-on-failure: true - uses: dcarbone/install-jq-action@v3 - name: Run RISC-V checks - run: .github/assets/check_rv32imac.sh + run: .github/scripts/check_rv32imac.sh crate-checks: name: crate-checks (${{ matrix.partition }}/${{ matrix.total_partitions }}) diff --git a/.github/workflows/prepare-reth.yml b/.github/workflows/prepare-reth.yml index e738c72303..ee0c2de81f 100644 --- a/.github/workflows/prepare-reth.yml +++ b/.github/workflows/prepare-reth.yml @@ -43,7 +43,7 @@ jobs: uses: docker/build-push-action@v6 with: context: . - file: .github/assets/hive/Dockerfile + file: .github/scripts/hive/Dockerfile tags: ${{ inputs.image_tag }} outputs: type=docker,dest=./artifacts/reth_image.tar build-args: |