From b0703749a0e8138e408c300f7d429cb0aebf01a5 Mon Sep 17 00:00:00 2001 From: Oliver Chang Date: Mon, 23 Jun 2025 10:46:59 +1000 Subject: [PATCH 1/6] Add indexer build tests to GH actions. --- .github/workflows/index_build_tests.yml | 34 +++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/index_build_tests.yml diff --git a/.github/workflows/index_build_tests.yml b/.github/workflows/index_build_tests.yml new file mode 100644 index 000000000000..d7eba45717d5 --- /dev/null +++ b/.github/workflows/index_build_tests.yml @@ -0,0 +1,34 @@ +name: indexer tests + +permissions: + contents: read + +on: + pull_request: + paths: + - 'infra/base-images/base-builder/indexer/**' + - '.github/workflows/index_build_tests.yml' + +jobs: + build: + runs-on: ubuntu-latest + permissions: + actions: write + concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + steps: + - uses: actions/checkout@v4 + with: # Needed for git diff to work. (get_changed_files) + fetch-depth: 0 + - run: | + git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/master + + - name: Setup python environment + uses: actions/setup-python@v5 + with: + python-version: 3.11 + + - name: Run infra tests + run: sudo env "PATH=$PATH" INDEXER_BUILD_TESTS=1 python -m unittest index_build_test + working-directory: 'infra/base-images/base-builder/indexer' \ No newline at end of file From 3e25ef9c0a79fa57875e934ae7a70a059985cc7e Mon Sep 17 00:00:00 2001 From: Oliver Chang Date: Mon, 23 Jun 2025 10:48:48 +1000 Subject: [PATCH 2/6] typo --- .github/workflows/index_build_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/index_build_tests.yml b/.github/workflows/index_build_tests.yml index d7eba45717d5..6efdbf8dcb4a 100644 --- a/.github/workflows/index_build_tests.yml +++ b/.github/workflows/index_build_tests.yml @@ -30,5 +30,5 @@ jobs: python-version: 3.11 - name: Run infra tests - run: sudo env "PATH=$PATH" INDEXER_BUILD_TESTS=1 python -m unittest index_build_test + run: sudo env "PATH=$PATH" INDEX_BUILD_TESTS=1 python -m unittest index_build_test working-directory: 'infra/base-images/base-builder/indexer' \ No newline at end of file From 6f4eddd828d7fc8c092f203eeb512d3d4c1758c2 Mon Sep 17 00:00:00 2001 From: Oliver Chang Date: Mon, 23 Jun 2025 10:50:41 +1000 Subject: [PATCH 3/6] no ti --- infra/base-images/base-builder/indexer/index_build_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/base-images/base-builder/indexer/index_build_test.py b/infra/base-images/base-builder/indexer/index_build_test.py index 10567dcf5873..6f483b1a9f09 100644 --- a/infra/base-images/base-builder/indexer/index_build_test.py +++ b/infra/base-images/base-builder/indexer/index_build_test.py @@ -40,7 +40,7 @@ def _build_project(self, project: str, *additional_args) -> Sequence[Path]: out_dir = OSS_FUZZ_DIR / f'build/out/{project}' docker_args = [ - 'docker', 'run', '--rm', '-ti', '-e', f'PROJECT_NAME={project}', '-v', + 'docker', 'run', '--rm', '-e', f'PROJECT_NAME={project}', '-v', f'{THIS_DIR}:/opt/indexer', '-v', f'{out_dir}:/out', f'gcr.io/oss-fuzz/{project}', '/opt/indexer/index_build.py' ] From 78057a35c7595ced88bdd95cefab73c55691e998 Mon Sep 17 00:00:00 2001 From: Oliver Chang Date: Mon, 23 Jun 2025 10:51:06 +1000 Subject: [PATCH 4/6] rename --- .github/workflows/index_build_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/index_build_tests.yml b/.github/workflows/index_build_tests.yml index 6efdbf8dcb4a..d127be706176 100644 --- a/.github/workflows/index_build_tests.yml +++ b/.github/workflows/index_build_tests.yml @@ -10,7 +10,7 @@ on: - '.github/workflows/index_build_tests.yml' jobs: - build: + test: runs-on: ubuntu-latest permissions: actions: write @@ -29,6 +29,6 @@ jobs: with: python-version: 3.11 - - name: Run infra tests + - name: Run indexer tests run: sudo env "PATH=$PATH" INDEX_BUILD_TESTS=1 python -m unittest index_build_test working-directory: 'infra/base-images/base-builder/indexer' \ No newline at end of file From e97a0f0cde6785c8c6170dd28fc93432675411da Mon Sep 17 00:00:00 2001 From: Oliver Chang Date: Mon, 23 Jun 2025 10:59:27 +1000 Subject: [PATCH 5/6] download indexer --- .github/workflows/index_build_tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/index_build_tests.yml b/.github/workflows/index_build_tests.yml index d127be706176..50c5a341d955 100644 --- a/.github/workflows/index_build_tests.yml +++ b/.github/workflows/index_build_tests.yml @@ -29,6 +29,10 @@ jobs: with: python-version: 3.11 + - name: Get latest indexer binary. + run: curl -O https://clusterfuzz-builds.storage.googleapis.com/oss-fuzz-artifacts/indexer + working-directory: 'infra/base-images/base-builder/indexer' + - name: Run indexer tests run: sudo env "PATH=$PATH" INDEX_BUILD_TESTS=1 python -m unittest index_build_test working-directory: 'infra/base-images/base-builder/indexer' \ No newline at end of file From ce807edc33c7fcf6da8e7f1ea92df99b1c7e2b63 Mon Sep 17 00:00:00 2001 From: Oliver Chang Date: Mon, 23 Jun 2025 11:04:36 +1000 Subject: [PATCH 6/6] chmod --- .github/workflows/index_build_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/index_build_tests.yml b/.github/workflows/index_build_tests.yml index 50c5a341d955..6af39e69131e 100644 --- a/.github/workflows/index_build_tests.yml +++ b/.github/workflows/index_build_tests.yml @@ -29,8 +29,8 @@ jobs: with: python-version: 3.11 - - name: Get latest indexer binary. - run: curl -O https://clusterfuzz-builds.storage.googleapis.com/oss-fuzz-artifacts/indexer + - name: Get latest indexer binary + run: curl -O https://clusterfuzz-builds.storage.googleapis.com/oss-fuzz-artifacts/indexer && chmod +x indexer working-directory: 'infra/base-images/base-builder/indexer' - name: Run indexer tests