Fix username

infocusp · Apr 21, 2024 · b003949 · b003949
1 parent b0411d7
commit b003949
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 32 deletions.
diff --git a/.github/workflows/update_leaderboard_after_merge.yaml b/.github/workflows/update_leaderboard_after_merge.yaml
@@ -11,22 +11,28 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 10
 
-      - name: Get merged commit hash
-        id: merged_commit
+      - name: Get merge commit hash
+        id: merge_commit
         run: |
-          merged_commit=$(git show --format=%H -s $GITHUB_SHA)
-          echo "Merged commit $GITHUB_SHA"
-          echo "::set-output name=merged_commit::$merged_commit"
+          merge_commit=$(git log --merges --pretty=format:%H -1 $GITHUB_SHA)
+          echo "Found merge commit: $merge_commit"
+          # echo "::set-output name=merge_commit::$merge_commit"
+          echo "merge_commit=$merge_commit" >> "$GITHUB_ENV"
 
-      - name: Get author's name from merged commit
-        id: author_name
+      # Merge commit has maintainer's name so we get name from second last commit
+      - name: Get original author's name
+        id: original_author
         run: |
-          author_name=$(git show -s --format='%ae' ${{ steps.merged_commit.outputs.merged_commit }})
-          echo "::set-output name=author_name::$author_name"
-
-      - name: Print author's name
-        run: echo "${{ steps.author_name.outputs.author_name }}"
+          echo "Passed merge commit: $merge_commit"
+          echo "$(git log --format='%ae' -n 2 $merge_commit)"
+          original_author=$(git log --format='%an' -n 2 $merge_commit | tail -n 1)
+          original_email=$(git log --format='%ae' -n 2 $merge_commit | tail -n 1)
+          echo "Author of original commit is $original_author ($original_email)"
+          # echo "::set-output name=original_author::$original_author"
+          echo "original_author=$original_author" >> "$GITHUB_ENV"
 
 
       - name: Check if there are any changes in submissions dir
@@ -60,28 +66,29 @@ jobs:
       #     # author_name=$(git log -1 --pretty=format:'%an' -- "${{ steps.changes.outputs.src_files }}")
       #     author_name=$("${{ github.event.commits[0].author.name }}")
       #     echo Last author $author_name
-      #     echo "{author_name}={$author_name}" >> $GITHUB_OUTPUT    
+      #     echo "{author_name}={$author_name}" >> $GITHUB_OUTPUT
 
-      # - if: ${{ (steps.changes.outputs.src == 'true') && (steps.changes.outputs.src_count == 1) }}
-      #   name: Install Python
-      #   uses: actions/setup-python@v5
-      #   with:
-      #     python-version: "3.10"
+      - if: ${{ (steps.changes.outputs.src == 'true') && (steps.changes.outputs.src_count == 1) }}
+        name: Install Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
 
-      # - if: ${{ (steps.changes.outputs.src == 'true') && (steps.changes.outputs.src_count == 1) }}
-      #   name: Install dependencies
-      #   run: |
-      #     python -m pip install --upgrade pip
-      #     pip install -r session_2/challenge/requirements.txt
+      - if: ${{ (steps.changes.outputs.src == 'true') && (steps.changes.outputs.src_count == 1) }}
+        name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r session_2/challenge/requirements.txt
 
-      # - if: ${{ (steps.changes.outputs.src == 'true') && (steps.changes.outputs.src_count == 1) }}
-      #   name: Run leaderboard update script
-      #   id: leaderboard-update
-      #   run: |
-      #     cd session_2/challenge
-      #     filename=$(basename "${{ steps.changes.outputs.src_files }}")
-      #     filename_without_extension="${filename%.*}"  # Remove extension          
-      #     python -m scripts.leaderboard --github_name="${{ steps.author_name.outputs.author_name }}" --prompt="$filename_without_extension"
+      - if: ${{ (steps.changes.outputs.src == 'true') && (steps.changes.outputs.src_count == 1) }}
+        name: Run leaderboard update script
+        id: leaderboard-update
+        run: |
+          cd session_2/challenge
+          filename=$(basename "${{ steps.changes.outputs.src_files }}")
+          filename_without_extension="${filename%.*}"  # Remove extension          
+          echo "Author name: $original_author | Submission name: $filename_without_extension"
+          python -m scripts.leaderboard --github_name="${{ steps.author_name.outputs.author_name }}" --prompt="$filename_without_extension"
 
       # - if: ${{ (steps.changes.outputs.src == 'true') && (steps.changes.outputs.src_count == 1) }}
       #   name: Commit changes

diff --git a/session_2/challenge/leaderboard.md b/session_2/challenge/leaderboard.md
@@ -15,7 +15,6 @@ Check [participation guide](how_to_participate.md).
 |   Rank | Name   | Solution                                                                                                         |   Accuracy % |
 |-------:|:-------|:-----------------------------------------------------------------------------------------------------------------|-------------:|
 |      1 | XYZ    | [baseline](https://github.com/infocusp/llm_seminar_series/blob/main/session_2/challenge/submissions/baseline.py) |          100 |
-|      2 |        | [baseline](https://github.com/infocusp/llm_seminar_series/blob/main/session_2/challenge/submissions/baseline.py) |           50 |
 <!-- leader-board-ends -->
 
 </center>