From a3f0a7d7a70c50c0632ee09418e6016d501ae3f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cem=20G=C3=B6kmen?= <cgokmen@stanford.edu>
Date: Wed, 23 Oct 2024 18:05:30 -0700
Subject: [PATCH 1/2] Update all CI runs to not use omnigibson-src directory.

---
 .github/workflows/examples-as-test.yml | 19 ++-----------------
 .github/workflows/profiling.yml        |  3 +--
 .github/workflows/tests.yml            | 13 +------------
 3 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/examples-as-test.yml b/.github/workflows/examples-as-test.yml
index 7d595ae85..b557e7035 100644
--- a/.github/workflows/examples-as-test.yml
+++ b/.github/workflows/examples-as-test.yml
@@ -21,22 +21,18 @@ jobs:
         shell: micromamba run -n omnigibson /bin/bash -leo pipefail {0}
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: true
-          path: omnigibson-src
              
       - name: Install
-        working-directory: omnigibson-src
         run: pip install -e .[dev]
 
       - name: Generate example tests
-        working-directory: omnigibson-src
         run: python tests/create_tests_of_examples.py
 
       - name: Get list of generated tests
         id: get-test-list
-        working-directory: omnigibson-src
         run: |
           echo "example_tests=$(cat tests/example_tests.json)" >> $GITHUB_OUTPUT
 
@@ -69,17 +65,14 @@ jobs:
         run: echo "HOME=/root" >> $GITHUB_ENV
 
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: true
-          path: omnigibson-src
 
       - name: Install
-        working-directory: omnigibson-src
         run: pip install -e .[dev]
 
       - name: Run tests
-        working-directory: omnigibson-src
         run: pytest -s tests/tests_of_examples/${{ matrix.test_file }}.py --junitxml=${{ matrix.test_file }}.xml && cp ${{ matrix.test_file }}.xml ${GITHUB_WORKSPACE}/
 
       - name: Deploy artifact
@@ -99,20 +92,12 @@ jobs:
         shell: micromamba run -n omnigibson /bin/bash -leo pipefail {0}
     needs: [run_test]
     steps:
-      - name: Checkout source
-        uses: actions/checkout@v2
-        with:
-          submodules: true
-          path: omnigibson-src
       - name: Pull reports
         uses: actions/download-artifact@v3
-        with:
-          path: omnigibson-src
       - name: Example Test Report0
         uses: dorny/test-reporter@v1
         with:
           name: Example Test Results
-          working-directory: omnigibson-src
           path: ${{ github.run_id }}-tests-*/*_test.xml
           reporter: java-junit
           fail-on-error: 'true'
diff --git a/.github/workflows/profiling.yml b/.github/workflows/profiling.yml
index a6ccba29f..fc11572d9 100644
--- a/.github/workflows/profiling.yml
+++ b/.github/workflows/profiling.yml
@@ -30,10 +30,9 @@ jobs:
         run: echo "HOME=/root" >> $GITHUB_ENV
 
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install
-        working-directory: omnigibson-src
         run: pip install -e .[dev]
       
       - name: Run performance benchmark
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2c1f8eef0..591e8b1ef 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -44,20 +44,17 @@ jobs:
 
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: true
-          path: omnigibson-src
 
       - name: Install
-        working-directory: omnigibson-src
         run: pip install -e .[dev]
 
       - name: Print env
         run: printenv
 
       - name: Run tests
-        working-directory: omnigibson-src
         run: pytest -s tests/${{ matrix.test_file }}.py --junitxml=${{ matrix.test_file }}.xml && cp ${{ matrix.test_file }}.xml ${GITHUB_WORKSPACE}/
         continue-on-error: true
 
@@ -89,20 +86,12 @@ jobs:
     needs: [run_test]
     if: always()
     steps:
-      - name: Checkout source
-        uses: actions/checkout@v2
-        with:
-          submodules: true
-          path: omnigibson-src
       - name: Pull reports
         uses: actions/download-artifact@v3
-        with:
-          path: omnigibson-src
       - name: Test Report0
         uses: dorny/test-reporter@v1
         with:
           name: Test Results
-          working-directory: omnigibson-src
           path: ${{ github.run_id }}-tests-*/test_*.xml
           reporter: java-junit
           fail-on-error: 'false'

From ae931b9d41c57a998dda30c88c6cf09906ffcb49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cem=20G=C3=B6kmen?=
 <1408354+cgokmen@users.noreply.github.com>
Date: Tue, 10 Dec 2024 16:29:18 -0800
Subject: [PATCH 2/2] Update tests.yml

---
 .github/workflows/tests.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2d00b91ee..e125c307e 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -87,12 +87,20 @@ jobs:
     needs: [run_test]
     if: always()
     steps:
+      - name: Checkout source
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+          path: omnigibson-src
       - name: Pull reports
         uses: actions/download-artifact@v3
+        with:
+          path: omnigibson-src
       - name: Test Report0
         uses: dorny/test-reporter@v1
         with:
           name: Test Results
+          working-directory: omnigibson-src
           path: ${{ github.run_id }}-tests-*/test_*.xml
           reporter: java-junit
           fail-on-error: 'false'