Make repository reusable by other sponsorables, simplify browser usage (

#51) * Use github repo owner and variables for easier reuse * Revert to python to avoid improper flags parsing * Make sure UTF8 is used in files * Use built-in Chrome in macOS * Render sponsorable in use
devlooped · Sep 10, 2024 · 84e9861 · 84e9861
1 parent 70a5280
commit 84e9861
Show file tree

Hide file tree

Showing 92 changed files with 26 additions and 31 deletions.
diff --git a/.github/avatars/4OTC.png b/.github/avatars/4OTC.png
diff --git a/.github/avatars/AshleyMedway.png b/.github/avatars/AshleyMedway.png
diff --git a/.github/avatars/BlauhausTechnology.png b/.github/avatars/BlauhausTechnology.png
diff --git a/.github/avatars/ChilliCream.png b/.github/avatars/ChilliCream.png
diff --git a/.github/avatars/Chris-Johnston.png b/.github/avatars/Chris-Johnston.png
diff --git a/.github/avatars/DarrenAtConexus.png b/.github/avatars/DarrenAtConexus.png
diff --git a/.github/avatars/Giorgi.png b/.github/avatars/Giorgi.png
diff --git a/.github/avatars/IxTechnologies.png b/.github/avatars/IxTechnologies.png
diff --git a/.github/avatars/Jonathan-Hickey.png b/.github/avatars/Jonathan-Hickey.png
diff --git a/.github/avatars/Keflon.png b/.github/avatars/Keflon.png
diff --git a/.github/avatars/KenBonny.png b/.github/avatars/KenBonny.png
diff --git a/.github/avatars/KirillOsenkov.png b/.github/avatars/KirillOsenkov.png
diff --git a/.github/avatars/LosManos.png b/.github/avatars/LosManos.png
diff --git a/.github/avatars/MFB-Technologies-Inc.png b/.github/avatars/MFB-Technologies-Inc.png
diff --git a/.github/avatars/MariuszKogut.png b/.github/avatars/MariuszKogut.png
diff --git a/.github/avatars/MelbourneDeveloper.png b/.github/avatars/MelbourneDeveloper.png
diff --git a/.github/avatars/MikeCodesDotNET.png b/.github/avatars/MikeCodesDotNET.png
diff --git a/.github/avatars/Mrxx99.png b/.github/avatars/Mrxx99.png
diff --git a/.github/avatars/SeanKilleen.png b/.github/avatars/SeanKilleen.png
diff --git a/.github/avatars/SimonCropp.png b/.github/avatars/SimonCropp.png
diff --git a/.github/avatars/Tdue21.png b/.github/avatars/Tdue21.png
diff --git a/.github/avatars/agileworks-eu.png b/.github/avatars/agileworks-eu.png
diff --git a/.github/avatars/agocke.png b/.github/avatars/agocke.png
diff --git a/.github/avatars/akunzai.png b/.github/avatars/akunzai.png
diff --git a/.github/avatars/angelobelchior.png b/.github/avatars/angelobelchior.png
diff --git a/.github/avatars/aritchie.png b/.github/avatars/aritchie.png
diff --git a/.github/avatars/arsdragonfly.png b/.github/avatars/arsdragonfly.png
diff --git a/.github/avatars/augustoproiete.png b/.github/avatars/augustoproiete.png
diff --git a/.github/avatars/aws.png b/.github/avatars/aws.png
diff --git a/.github/avatars/bitbonk.png b/.github/avatars/bitbonk.png
diff --git a/.github/avatars/bngv.png b/.github/avatars/bngv.png
diff --git a/.github/avatars/brooke-hamilton.png b/.github/avatars/brooke-hamilton.png
diff --git a/.github/avatars/certifytheweb.png b/.github/avatars/certifytheweb.png
diff --git a/.github/avatars/chiluap.png b/.github/avatars/chiluap.png
diff --git a/.github/avatars/clarius.png b/.github/avatars/clarius.png
diff --git a/.github/avatars/danielrmay.png b/.github/avatars/danielrmay.png
diff --git a/.github/avatars/dannevesdantas.png b/.github/avatars/dannevesdantas.png
diff --git a/.github/avatars/dansiegel.png b/.github/avatars/dansiegel.png
diff --git a/.github/avatars/davidjenni.png b/.github/avatars/davidjenni.png
diff --git a/.github/avatars/davidpallmann.png b/.github/avatars/davidpallmann.png
diff --git a/.github/avatars/davidpetric.png b/.github/avatars/davidpetric.png
diff --git a/.github/avatars/davkean.png b/.github/avatars/davkean.png
diff --git a/.github/avatars/decriptor.png b/.github/avatars/decriptor.png
diff --git a/.github/avatars/dgnaegi.png b/.github/avatars/dgnaegi.png
diff --git a/.github/avatars/drivenet.png b/.github/avatars/drivenet.png
diff --git a/.github/avatars/eajhnsn1.png b/.github/avatars/eajhnsn1.png
diff --git a/.github/avatars/eeseewy.png b/.github/avatars/eeseewy.png
diff --git a/.github/avatars/ehonda.png b/.github/avatars/ehonda.png
diff --git a/.github/avatars/garywoodfine.png b/.github/avatars/garywoodfine.png
diff --git a/.github/avatars/georg-jung.png b/.github/avatars/georg-jung.png
diff --git a/.github/avatars/jakobt.png b/.github/avatars/jakobt.png
diff --git a/.github/avatars/jeremysimmons.png b/.github/avatars/jeremysimmons.png
diff --git a/.github/avatars/jfoshee.png b/.github/avatars/jfoshee.png
diff --git a/.github/avatars/juanfranblanco.png b/.github/avatars/juanfranblanco.png
diff --git a/.github/avatars/kazo0.png b/.github/avatars/kazo0.png
diff --git a/.github/avatars/kfrancis.png b/.github/avatars/kfrancis.png
diff --git a/.github/avatars/kristinnstefansson.png b/.github/avatars/kristinnstefansson.png
diff --git a/.github/avatars/lavahot.png b/.github/avatars/lavahot.png
diff --git a/.github/avatars/lucabriguglia.png b/.github/avatars/lucabriguglia.png
diff --git a/.github/avatars/mackayn.png b/.github/avatars/mackayn.png
diff --git a/.github/avatars/mckhendry.png b/.github/avatars/mckhendry.png
diff --git a/.github/avatars/meisenring.png b/.github/avatars/meisenring.png
diff --git a/.github/avatars/michaelstaib.png b/.github/avatars/michaelstaib.png
diff --git a/.github/avatars/mrange.png b/.github/avatars/mrange.png
diff --git a/.github/avatars/newrelic.png b/.github/avatars/newrelic.png
diff --git a/.github/avatars/nietras.png b/.github/avatars/nietras.png
diff --git a/.github/avatars/okyrylchuk.png b/.github/avatars/okyrylchuk.png
diff --git a/.github/avatars/pedrobsaila.png b/.github/avatars/pedrobsaila.png
diff --git a/.github/avatars/ploeh.png b/.github/avatars/ploeh.png
diff --git a/.github/avatars/rbnswartz.png b/.github/avatars/rbnswartz.png
diff --git a/.github/avatars/rcollette.png b/.github/avatars/rcollette.png
diff --git a/.github/avatars/richlee.png b/.github/avatars/richlee.png
diff --git a/.github/avatars/sandrock.png b/.github/avatars/sandrock.png
diff --git a/.github/avatars/seanalexander.png b/.github/avatars/seanalexander.png
diff --git a/.github/avatars/shahzadhuq.png b/.github/avatars/shahzadhuq.png
diff --git a/.github/avatars/sorahex.png b/.github/avatars/sorahex.png
diff --git a/.github/avatars/tbolon.png b/.github/avatars/tbolon.png
diff --git a/.github/avatars/tinohager.png b/.github/avatars/tinohager.png
diff --git a/.github/avatars/tonyqus.png b/.github/avatars/tonyqus.png
diff --git a/.github/avatars/torutek-gh.png b/.github/avatars/torutek-gh.png
diff --git a/.github/avatars/twenzel.png b/.github/avatars/twenzel.png
diff --git a/.github/avatars/unoplatform.png b/.github/avatars/unoplatform.png
diff --git a/.github/avatars/v-limo.png b/.github/avatars/v-limo.png
diff --git a/.github/avatars/vezel-dev.png b/.github/avatars/vezel-dev.png
diff --git a/.github/avatars/voroninp.png b/.github/avatars/voroninp.png
diff --git a/.github/avatars/wdolek.png b/.github/avatars/wdolek.png
diff --git a/.github/avatars/wjgthb.png b/.github/avatars/wjgthb.png
diff --git a/.github/avatars/yrashk.png b/.github/avatars/yrashk.png
diff --git a/.github/workflows/sponsors.ps1 b/.github/workflows/sponsors.ps1
@@ -19,7 +19,7 @@ function Write-Organization {
 	</foreignObject>
 </svg>";
 
-  $svg | Set-Content -Path ".github/avatars/$($node.login).svg";
+  $svg | Set-Content -Encoding UTF8 -Path ".github/avatars/$($node.login).svg";
   write-host "=> $($node.login).svg" -ForegroundColor Green;
 }
 
@@ -45,13 +45,21 @@ function Write-User {
 	</foreignObject>
 </svg>";
 
-  $svg | Set-Content -Path ".github/avatars/$($node.login).svg";
+  $svg | Set-Content -Encoding UTF8 -Path ".github/avatars/$($node.login).svg";
   write-host "=> $($node.login).svg" -ForegroundColor DarkGray;
 }
 
 gh auth status
 
-$query = gh api graphql --paginate --jq '.data.organization.sponsorshipsAsMaintainer.nodes' -f owner='devlooped' -f query='
+$sponsorable = $env:sponsorable
+
+if ([string]::IsNullOrEmpty($sponsorable)) {
+  throw "Environment variable 'sponsorable' is required."
+}
+
+write-host "Sponsorable account: $sponsorable" -ForegroundColor Cyan
+
+$query = gh api graphql --paginate --jq '.data.organization.sponsorshipsAsMaintainer.nodes' -f owner=$sponsorable -f query='
 query ($owner: String!, $endCursor: String) {
   organization(login: $owner) {
     sponsorshipsAsMaintainer(first: 100, after: $endCursor, orderBy: {field: CREATED_AT, direction: ASC}, includePrivate: false) {
@@ -106,14 +114,11 @@ $gold | %{ gh api graphql --jq '.data.organization' -f login=$_ -f query='query(
 $links = "";
 
 foreach ($sponsor in $sponsors) {
-  $links += "[![$($sponsor.sponsorEntity.name)](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/$($sponsor.sponsorEntity.login).png `"$($sponsor.sponsorEntity.name)`")](https://github.com/$($sponsor.sponsorEntity.login))`n";
+  $links += "[![$($sponsor.sponsorEntity.name)](https://raw.githubusercontent.com/$sponsorable/sponsors/main/.github/avatars/$($sponsor.sponsorEntity.login).png `"$($sponsor.sponsorEntity.name)`")](https://github.com/$($sponsor.sponsorEntity.login))`n";
 }
 
 $links | Out-File ./sponsors.md -Force -Encoding UTF8
 
-write-host "Using chrome from $env:chrome"
-
 Push-Location .github/avatars
-$flags = '--hide-scrollbars --default-background-color=00000000 --headless --disable-remote-debugging --no-sandbox'
-Get-ChildItem *.svg | %{ html2image --css ../workflows/sponsors.css --html "$($_.Name)" --save "$($_.BaseName).png" --chrome_path "$env:chrome" --custom_flags $flags -v --size 39,39}
+Get-ChildItem *.svg | %{ python ../workflows/sponsors.py "$($_.Name)" "$($_.BaseName).png" }
 Pop-Location
diff --git a/.github/workflows/sponsors.py b/.github/workflows/sponsors.py
@@ -2,16 +2,14 @@
 import sys
 from html2image import Html2Image
 
-chrome = sys.argv[1]
 # read entire contents of file in args[2] as input
-with open(sys.argv[2], 'r') as file:
+with open(sys.argv[1], 'r', encoding='utf-8') as file:
     input = file.read()
 
-output = sys.argv[3]
+output = sys.argv[2]
 
-hti = Html2Image(size=(38,38), browser_executable=chrome)
+hti = Html2Image(size=(39,39), custom_flags=['--headless', '--hide-scrollbars', '--default-background-color=00000000', '--disable-remote-debugging', '--no-sandbox'])
 hti.browser.print_command = True
-hti.browser.flags = ['--hide-scrollbars', '--default-background-color=00000000', '--headless', '--disable-remote-debugging', '--no-sandbox'];
 
 # specify css with zero margin and padding and transparent html background
 css = '''
@@ -22,5 +20,5 @@
 }
 '''
 
-print(f'{input} -> {output}')
+print(f'{sys.argv[1]} -> {output}')
 hti.screenshot(html_str=input, css_str=css, save_as=output)
diff --git a/.github/workflows/sponsors.yml b/.github/workflows/sponsors.yml
@@ -2,12 +2,6 @@
 name: sponsors
 on:
   workflow_dispatch:
-    inputs:
-      chrome:
-        # Lookup desired version at https://chromiumdash.appspot.com/releases?platform=Windows
-        # Then find the closest position to the Base Branch Position at 
-        # https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Win_x64/
-        description: Chrome Position
   schedule:
     - cron: "0 23 * * *"
   push:
@@ -24,8 +18,8 @@ jobs:
       - name: 🤖 defaults
         uses: devlooped/actions-bot@v1
         with:
-          name: ${{ secrets.BOT_NAME }}
-          email: ${{ secrets.BOT_EMAIL }}
+          name: ${{ vars.BOT_NAME || secrets.BOT_NAME }}
+          email: ${{ vars.BOT_EMAIL || secrets.BOT_EMAIL }}
           gh_token: ${{ secrets.GH_TOKEN }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -34,22 +28,15 @@ jobs:
         with: 
           token: ${{ env.GH_TOKEN }}
 
-      - name: 🌐 chrome
-        uses: browser-actions/setup-chrome@v1
-        id: chrome
-        with:
-          chrome-version: ${{ github.event.inputs.chrome || vars.chrome || '1331469' }} 
-          install-dependencies: true
-          install-chromedriver: true
-
       - name: 🔽 html2image
-        run: pip install --force-reinstall -v html2image==2.0.5
+        run: pip install --force-reinstall -v html2image==2.0.3
 
       - name: 💜 sponsors
         shell: pwsh
         run: ./.github/workflows/sponsors.ps1
         env:
           chrome: ${{ steps.chrome.outputs.chrome-path }}
+          sponsorable: ${{ github.repository_owner }}
 
       - name: +Mᐁ includes
         uses: devlooped/actions-include@v1

diff --git a/readme.md b/readme.md
@@ -7,6 +7,11 @@ The list can be included directly by using the [resolve file includes](https://g
 action and pointing the include to the [sponsors.md](https://github.com/devlooped/sponsors/raw/main/sponsors.md) or 
 the convenient [footer.md](https://github.com/devlooped/sponsors/raw/main/footer.md) (as `raw` links).
 
+To reuse this in your own fork, add a secret named `GH_TOKEN` that has permissions to query your sponsorships 
+(via the [GitHub CLI](https://cli.github.com)) and update files in your repository. The `BOT_NAME` and `BOT_EMAIL` 
+repo/org secrets or variables can be used to set the committer name and email.
+
+
 <!-- include sponsors.md -->
 [![Clarius Org](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/clarius.png "Clarius Org")](https://github.com/clarius)
 [![Kirill Osenkov](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/KirillOsenkov.png "Kirill Osenkov")](https://github.com/KirillOsenkov)