Merge branch 'main' into main

Author: stasel

.github/workflows/grade-assignment.yml

@@ -1,7 +1,7 @@
 name: Grade Assignment
 
 on:
-  pull_request:
+  pull_request_target:
     branches:
       - main
 
@@ -10,45 +10,62 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write
+      issues: write
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: "24"
+          node-version: "lts/*"
 
       - name: Run tests
-        id: test
-        run: |
-          node .hyf/tester.js > test-output.txt 2>&1
-          echo "exit_code=$?" >> $GITHUB_OUTPUT
-        continue-on-error: true
+        working-directory: .hyf
+        run: node tester.js > test-output.txt 2>&1
 
       - name: Read test output
         id: output
         run: |
-          OUTPUT=$(cat test-output.txt)
+          OUTPUT=$(cat .hyf/test-output.txt)
           echo "results<<EOF" >> $GITHUB_OUTPUT
           echo "$OUTPUT" >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
 
+      - name: Read score
+        id: score
+        run: |
+          SCORE=$(jq -r '.score' .hyf/score.json)
+          PASS=$(jq -r '.pass' .hyf/score.json)
+          PASSING_SCORE=$(jq -r '.passingScore' .hyf/score.json)
+          echo "score=$SCORE" >> $GITHUB_OUTPUT
+          echo "pass=$PASS" >> $GITHUB_OUTPUT
+          echo "passing_score=$PASSING_SCORE" >> $GITHUB_OUTPUT
+
       - name: Comment PR
         uses: actions/github-script@v7
         with:
           script: |
             const output = `${{ steps.output.outputs.results }}`;
-            const exitCode = '${{ steps.test.outputs.exit_code }}';
-            const status = exitCode === '0' ? '✅ Passed' : '❌ Failed';
+            const score = '${{ steps.score.outputs.score }}';
+            const pass = '${{ steps.score.outputs.pass }}' === 'true';
+            const passingScore = '${{ steps.score.outputs.passing_score }}';
+            const status = pass ? '✅ Passed' : '❌ Failed';
             github.rest.issues.createComment({
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: `## Assignment Grade ${status}\n\n\`\`\`\n${output}\n\`\`\``
+              body: `## !Assignment score ${score} / 100\n\n
+                **Score:** ${score}/${passingScore}\n\n
+                <details>\n
+                  <summary>Test Details</summary>\n\n
+                  \`\`\`\n${output}\n\`\`\`\n\n
+                </details>`
             });
 
       - name: Fail if tests failed
-        if: steps.test.outputs.exit_code != '0'
+        if: steps.score.outputs.pass != 'true'
         run: exit 1

.gitignore

@@ -3,6 +3,9 @@
 Thumbs.db
 [Dd]esktop.ini
 
+# hyf
+.hyf/score.json
+
 # Editor and IDE settings
 .vscode/
 .idea/

.hyf/tester.js

@@ -1,5 +1,6 @@
 import { task1 } from './task1.js';
 import { task2 } from './task2.js';
+import fs from 'fs/promises';
 
 const main = async () => {
   console.log('======================= Task 1 =======================');
@@ -10,18 +11,18 @@ const main = async () => {
 
   console.log('\n======================= Summary =======================');
   const totalScore = Math.min(100, Math.round(score1 * 0.7 + score2 * 0.3));
-  const minPassingScore = 70;
+  const passingScore = 70;
   console.log(`- Task 1 Score: ${score1}%`);
   console.log(`- Task 2 Score: ${score2}%`);
   console.log(`Total Score: ${totalScore}%`);
-  console.log(`Min passing score: ${minPassingScore}%`);
+  console.log(`Min passing score: ${passingScore}%`);
+  const results = {
+    score: totalScore,
+    pass: totalScore >= passingScore,
+    passingScore: passingScore
+  };
 
-
-  if (totalScore > 70) {
-    process.exit(0);
-  } else {
-    process.exit(1);
-  }
+  await fs.writeFile('score.json', JSON.stringify(results, null, 2));
 }
 
 try {

task-1/setup.sh

@@ -1,2 +1,2 @@
 # Write your code here
-echo "JavaScript works?"
+echo "JavaScript works?s"