diff --git a/.all-contributorsrc b/.all-contributorsrc index a537268d4..b35294cdf 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -982,6 +982,17 @@ "avatar_url": [ "https://avatars.githubusercontent.com/u/56853002?v=4" ] + }, + { + "login": "manbat", + "name": "manbat", + "contributions": [ + "code" + ], + "profile": "https://github.com/manbat", + "avatar_url": [ + "https://avatars.githubusercontent.com/u/41646490?v=4" + ] } ], "contributorsPerLine": 7 diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 86d3d78a1..e993b3e30 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,4 +1,4 @@ -blank_issues_enabled: false +blank_issues_enabled: true contact_links: - name: Get in Contact url: https://us-rse.org/steering-committee/ diff --git a/.github/workflows/generate-newsletter.yml b/.github/workflows/generate-newsletter.yml index 8c7a4399b..c87522833 100644 --- a/.github/workflows/generate-newsletter.yml +++ b/.github/workflows/generate-newsletter.yml @@ -13,17 +13,41 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Extract values from issue body + - name: Print raw issue body + run: | + echo "--------- GITHUB.EVENT.ISSUE.BODY ---------" + echo "${{ github.event.issue.body }}" + echo "-------------------------------------------" + + - name: Extract values from issue title id: vars run: | - month=$(echo "${{ github.event.issue.body }}" | grep -i "Newsletter Month" -A 1 | tail -n 1 | xargs) - year=$(echo "${{ github.event.issue.body }}" | grep -i "Newsletter Year" -A 1 | tail -n 1 | xargs) - # Convert month name to MM + title="${{ github.event.issue.title }}" + + # Extract month and year using awk + month=$(echo "$title" | awk -F': ' '{print $2}' | awk '{print $1}') + year=$(echo "$title" | awk -F': ' '{print $2}' | awk '{print $2}') + + if [ -z "$month" ] || [ -z "$year" ]; then + echo "❌ Could not extract month or year from title." + echo "Title was: $title" + exit 1 + fi + month_num=$(date -d "$month 1" '+%m') - date="${year}-${month_num}-01" + date="${year}-${month_num}" branch="feature/newsletter-${year}-${month_num}" - filename="_posts/${date}-newsletter.md" - + filename="_posts/newsletters/${date}-newsletter.md" + + echo "✅ Parsed values:" + echo " Title: $title" + echo " Month: $month" + echo " Year: $year" + echo " Month Num: $month_num" + echo " Date: $date" + echo " Branch: $branch" + echo " Filename: $filename" + echo "month=$month" >> $GITHUB_OUTPUT echo "month_num=$month_num" >> $GITHUB_OUTPUT echo "year=$year" >> $GITHUB_OUTPUT @@ -56,3 +80,4 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | gh issue comment ${{ github.event.issue.number }} --body "Draft file created for **${{ steps.vars.outputs.month }} ${{ steps.vars.outputs.year }}** at \`${{ steps.vars.outputs.filename }}\` in branch \`${{ steps.vars.outputs.branch }}\`.\n\nYou can now:\n1. Open the branch in VS Code using GitFlow (\`feature/newsletter-${{ steps.vars.outputs.year }}-${{ steps.vars.outputs.month_num }}\`)\n2. Edit and review the draft\n3. Open a PR into \`develop\` when ready" + diff --git a/.github/workflows/linting.yaml b/.github/workflows/linting.yaml index 00945bf6b..b99bdced7 100644 --- a/.github/workflows/linting.yaml +++ b/.github/workflows/linting.yaml @@ -57,7 +57,8 @@ jobs: https://bitcon.blacksintechnology.net/,\ https://travel.usnews.com/features/top-pride-parades-and-celebrations-in-the-us,\ https://family.20thcenturystudios.com/movies/hidden-figures,\ - https://www.usatoday.com/story/money/2023/06/07/silicon-valley-tech-black-history-roy-clay/70262081007/" + https://www.usatoday.com/story/money/2023/06/07/silicon-valley-tech-black-history-roy-clay/70262081007/,\ + https://aaan.uic.edu/student-engagement/uic-black-tech-scholars-program/" # Exclude these files from the checker exclude_files: "README.md,\ @@ -69,4 +70,5 @@ jobs: _config.yml,\ tests/test_,\ .github/workflows,\ + .github/ISSUE_TEMPLATE,\ _posts/newsletters/" diff --git a/.tributors b/.tributors index 7ad21ad48..c95ab4529 100644 --- a/.tributors +++ b/.tributors @@ -496,5 +496,9 @@ "TatsatJha": { "name": "TatsatJha", "blog": "https://github.com/TatsatJha" + }, + "manbat": { + "name": "manbat", + "blog": "https://github.com/manbat" } } \ No newline at end of file diff --git a/README.md b/README.md index 2acad7f1d..57edcd958 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ https://us-rse.org -[](#contributors) +[](#contributors) ## What is this? @@ -239,6 +239,9 @@ tool to generate a contributors graphic below.
+
+