From dd51bbeba033b770dacafc753acfd57b0663bae7 Mon Sep 17 00:00:00 2001 From: Erik Hu Date: Wed, 12 Nov 2025 09:13:44 +0000 Subject: [PATCH 1/2] add codeowners to develop branch of eclipse-score/inc_nlohmann_json --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 18402e515e..407eb38968 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -5,3 +5,4 @@ # were modified. All directories should have a proper codeowner # Syntax: https://help.github.com/articles/about-codeowners/ +* @4og @masc2023 @aschemmel-tech \ No newline at end of file From cb7ecf11f46b7f83a655b0d5afea14c5aca6e2a2 Mon Sep 17 00:00:00 2001 From: Erik Hu Date: Wed, 12 Nov 2025 14:26:52 +0000 Subject: [PATCH 2/2] test fix ubuntu workflow --- .github/workflows/ubuntu.yml | 69 +++++++++++++++++++++++++++++------- 1 file changed, 57 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index ec81f3892d..34c6ecc7b0 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -356,8 +356,16 @@ jobs: git commit -m "Create persistent storage" git push origin save_historical_data fi - git checkout $branch_name - git checkout save_historical_data -- TSF/MemoryEfficientTestResultData.db + # Handle fork PRs by staying on current working branch instead of switching + if [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then + # For PRs, we're already on the right commit from actions/checkout + # Just get the file from save_historical_data branch + git checkout save_historical_data -- TSF/MemoryEfficientTestResultData.db + else + # For push events, switch to the branch and get the file + git checkout $branch_name + git checkout save_historical_data -- TSF/MemoryEfficientTestResultData.db + fi - name: append test data run: | @@ -379,8 +387,15 @@ jobs: - name: Recover stash if: github.event_name == 'schedule' || (github.event_name == 'push' && github.ref_name == 'main') run: | - git checkout $branch_name - git stash apply + # Handle fork PRs by staying on current working branch instead of switching + if [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then + # For PRs, we're already on the right branch/commit + git stash apply + else + # For push events, switch back to the working branch + git checkout $branch_name + git stash apply + fi - name: Move test report run: | @@ -441,8 +456,16 @@ jobs: git commit -m "Create persistent storage" git push origin save_historical_data fi - git checkout $branch_name - git checkout save_historical_data -- TSF/MemoryEfficientTestResultData.db + # Handle fork PRs by staying on current working branch instead of switching + if [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then + # For PRs, we're already on the right commit from actions/checkout + # Just get the file from save_historical_data branch + git checkout save_historical_data -- TSF/MemoryEfficientTestResultData.db + else + # For push events, switch to the branch and get the file + git checkout $branch_name + git checkout save_historical_data -- TSF/MemoryEfficientTestResultData.db + fi - name: append test data run: | @@ -464,8 +487,15 @@ jobs: - name: Recover stash if: github.event_name == 'schedule' || (github.event_name == 'push' && github.ref_name == 'main') run: | - git checkout $branch_name - git stash apply + # Handle fork PRs by staying on current working branch instead of switching + if [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then + # For PRs, we're already on the right branch/commit + git stash apply + else + # For push events, switch back to the working branch + git checkout $branch_name + git stash apply + fi - name: Move test report run: | @@ -526,8 +556,16 @@ jobs: git commit -m "Create persistent storage" git push origin save_historical_data fi - git checkout $branch_name - git checkout save_historical_data -- TSF/MemoryEfficientTestResultData.db + # Handle fork PRs by staying on current working branch instead of switching + if [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then + # For PRs, we're already on the right commit from actions/checkout + # Just get the file from save_historical_data branch + git checkout save_historical_data -- TSF/MemoryEfficientTestResultData.db + else + # For push events, switch to the branch and get the file + git checkout $branch_name + git checkout save_historical_data -- TSF/MemoryEfficientTestResultData.db + fi - name: append test data run: | @@ -549,8 +587,15 @@ jobs: - name: Recover stash if: github.event_name == 'schedule' || (github.event_name == 'push' && github.ref_name == 'main') run: | - git checkout $branch_name - git stash apply + # Handle fork PRs by staying on current working branch instead of switching + if [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then + # For PRs, we're already on the right branch/commit + git stash apply + else + # For push events, switch back to the working branch + git checkout $branch_name + git stash apply + fi - name: Move test report run: |