fix(Build-Rock.yaml): missing dependency and path typo

clay-lake · Aug 21, 2024 · 5f04a16 · 5f04a16
1 parent d715934
commit 5f04a16
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/Build-Rock.yaml b/.github/workflows/Build-Rock.yaml
@@ -76,7 +76,7 @@ jobs:
       - name: Configure
         id: configure
         run: |
-          ${{ env.OCI_FACTORY_DIR }}/src/build-rock/configure/generate_matrix.py \
+          ${{ env.OCI_FACTORY_DIR }}/src/build-rock/configure/generate_build_matrix.py \
             --rockfile-directory "${{ env.ROCK_REPO_DIR }}/${{ inputs.rockfile-directory }}" \
             --lpci-fallback "${{ toJSON(inputs.lpci-fallback) }}" \
             --config ${{ toJSON(inputs.arch-map) }} # important: do not use quotes here

diff --git a/.github/workflows/_Test-OCI-Factory.yaml b/.github/workflows/_Test-OCI-Factory.yaml
@@ -45,6 +45,9 @@ jobs:
       # test-oci-factory/pytest requirements
       - run: pip install -r ${{ env.OCI_FACTORY_DIR }}/src/test-oci-factory/pytest/requirements.txt
 
+      # build-rock/configure requirements 
+      - run: pip install -r ${{ env.OCI_FACTORY_DIR }}/src/build-rock/configure/requirements.txt
+
 
       - name: Run pytest
         continue-on-error: true

diff --git a/src/test-oci-factory/pytest/data/sample_failure.xml b/src/test-oci-factory/pytest/data/sample_failure.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <testsuites>
    <testsuite name="pytest" errors="0" failures="1" skipped="0" tests="6" time="0.127" timestamp="2024-08-13T11:57:19.793644+00:00" hostname="fv-az1756-954">
-      <testcase classname="oci-factory.src.build-rock.configure.test.test_generate_matrix" name="test_get_target_archs" time="0.001" />
-      <testcase classname="oci-factory.src.build-rock.configure.test.test_generate_matrix" name="test_configure_matrices" time="0.000" />
-      <testcase classname="oci-factory.src.build-rock.configure.test.test_generate_matrix" name="test_configure_matrices_fallback_exception" time="0.000" />
-      <testcase classname="oci-factory.src.build-rock.configure.test.test_generate_matrix" name="test_configure_matrices_lpci_fallback" time="0.000" />
-      <testcase classname="oci-factory.src.build-rock.configure.test.test_generate_matrix" name="test_set_build_config_outputs" time="0.001" />
+      <testcase classname="oci-factory.src.build-rock.configure.test.test_generate_build_matrix" name="test_get_target_archs" time="0.001" />
+      <testcase classname="oci-factory.src.build-rock.configure.test.test_generate_build_matrix" name="test_configure_matrices" time="0.000" />
+      <testcase classname="oci-factory.src.build-rock.configure.test.test_generate_build_matrix" name="test_configure_matrices_fallback_exception" time="0.000" />
+      <testcase classname="oci-factory.src.build-rock.configure.test.test_generate_build_matrix" name="test_configure_matrices_lpci_fallback" time="0.000" />
+      <testcase classname="oci-factory.src.build-rock.configure.test.test_generate_build_matrix" name="test_set_build_config_outputs" time="0.001" />
       <testcase classname="oci-factory.src.docs.test.test_generate_oci_doc_yaml" name="test_example_failure" time="0.001">
          <failure message="AssertionError: This is to exemplify the output of a failed unit test&#10;assert False">def test_example_failure():
             &gt;       assert False, "This is to exemplify the output of a failed unit test"