diff --git a/.github/workflows/event-logger.yml b/.github/workflows/event-logger.yml index 6a9c232..18cb298 100644 --- a/.github/workflows/event-logger.yml +++ b/.github/workflows/event-logger.yml @@ -44,7 +44,10 @@ jobs: run: | echo $COMMITS > commits.json cat commits.json # debugging + GIT_USERNAME=$(jq -r '.[0].commit.author.name' commits.json) # Extract Git username + echo "Git Username: $GIT_USERNAME" pipenv run gitcommitlogger -r $(echo $REPOSITORY_URL) -t pull_request_merged -d $(echo $PR_CLOSED_AT) -un $(echo $GITHUB_LOGIN) -i commits.json -o commit_stats.csv -u $(echo $COMMIT_LOG_API) -v + echo "GIT_USERNAME=$GIT_USERNAME" >> $GITHUB_ENV # Pass it to the next steps - name: Log pull request closed without merge if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == false run: | diff --git a/.github/workflows/hook.yml b/.github/workflows/hook.yml index 758228c..80393ec 100644 --- a/.github/workflows/hook.yml +++ b/.github/workflows/hook.yml @@ -23,6 +23,9 @@ jobs: - name: Install dependencies run: npm install -g nodemailer + - name: Set Git Username + run: echo "GIT_USERNAME=$(git config user.name)" >> $GITHUB_ENV + - name: Send email notification env: GITHUB_EVENT: ${{ toJson(github.event) }} @@ -31,9 +34,9 @@ jobs: EVENT_TYPE: ${{ github.event_name }} EMAIL: ${{ secrets.EMAIL }} EMAIL_PASSWORD: ${{ secrets.EMAIL_PASSWORD }} + GIT_USERNAME: ${{ env.GIT_USERNAME }} run: | node -e " - const nodemailer = require('nodemailer'); const transporter = nodemailer.createTransport({ service: 'gmail', auth: { @@ -46,10 +49,11 @@ jobs: from: process.env.EMAIL, to: process.env.EMAIL, subject: 'GitHub Event Notification', - text: \`Event Type: ${{ github.event_name }}\n - GitHub Event: ${{ env.GITHUB_EVENT }}\n - GitHub Actor: ${{ env.GITHUB_ACTOR }}\n - GitHub User: ${{ env.GITHUB_USER }}\` + text: \`Event Type: \${process.env.EVENT_TYPE}\n + GitHub Event: \${process.env.GITHUB_EVENT}\n + GitHub Actor: \${process.env.GITHUB_ACTOR}\n + GitHub User: \${process.env.GITHUB_USER}\n + Git User (Git Username from commit): \${process.env.GIT_USERNAME}\` }; transporter.sendMail(mailOptions, (error, info) => { @@ -58,4 +62,4 @@ jobs: } console.log('Email sent: ' + info.response); }); - " + " \ No newline at end of file