Merge branch 'main' into direct-commit-includes

Author: kzu

.github/workflows/changelog.yml

@@ -4,26 +4,24 @@ on:
  types: [released]
  workflow_dispatch:
 
-env:
- GH_TOKEN: ${{ secrets.GH_TOKEN }}
-
 jobs:
  changelog:
  runs-on: ubuntu-latest
  steps:
- - name: 🔍 GH_TOKEN
- if: env.GH_TOKEN == ''
- env: 
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- run: echo "GH_TOKEN=${GITHUB_TOKEN}" >> $GITHUB_ENV
-
  - name: 🤘 checkout
  uses: actions/checkout@v2
  with:
  fetch-depth: 0
  ref: main
- token: ${{ env.GH_TOKEN }}
 
+ - name: 🔍 defaults
+ uses: ./.github/workflows/defaults
+ env:
+ GH_TOKEN_SECRET: ${{ secrets.GH_TOKEN }}
+ BOT_NAME_SECRET: ${{ secrets.BOT_NAME }}
+ BOT_EMAIL_SECRET: ${{ secrets.BOT_EMAIL }}
+ BOT_AUTHOR_SECRET: ${{ secrets.BOT_AUTHOR }}
+ 
  - name: ⚙ ruby
  uses: ruby/setup-ruby@v1
  with:
@@ -36,7 +34,7 @@ jobs:
 
  - name: 🚀 changelog
  run: |
- git config --local user.name github-actions
- git config --local user.email github-actions@github.com
+ git config --local user.name $BOT_NAME
+ git config --local user.email $BOT_EMAIL
  git add changelog.md
  (git commit -m "🖉 Update changelog with ${GITHUB_REF#refs/*/}" && git push) || echo "Done"

.github/workflows/defaults/action.yml

@@ -0,0 +1,59 @@
+name: test
+description: runs dotnet tests with retry
+runs:
+ using: "composite"
+ steps:
+ - name: 🔍 GH_TOKEN
+ if: env.GH_TOKEN == ''
+ shell: bash
+ run: |
+ if [ -z "$GH_TOKEN_SECRET" ]
+ then
+ echo "Using default GITHUB_TOKEN"
+ echo "GH_TOKEN=$GITHUB_TOKEN" >> $GITHUB_ENV
+ else
+ echo "Using custom GH_TOKEN"
+ echo "GH_TOKEN=$GH_TOKEN_SECRET" >> $GITHUB_ENV
+ fi
+
+ - name: 🔍 BOT
+ shell: bash
+ run: |
+ if [ -z "$BOT_NAME"]
+ then
+ if [ -z "$BOT_NAME_SECRET" ]
+ then
+ echo "Using default GITHUB_ACTOR as BOT_NAME"
+ BOT_NAME="$GITHUB_ACTOR"
+ else
+ echo "Using custom BOT_NAME"
+ BOT_NAME=$BOT_NAME_SECRET
+ fi
+ echo "BOT_NAME=$BOT_NAME" >> $GITHUB_ENV
+ fi
+
+ if [ -z "$BOT_EMAIL"]
+ then
+ if [ -z "$BOT_EMAIL_SECRET" ]
+ then
+ echo "Using default GITHUB_EMAIL as BOT_EMAIL"
+ BOT_EMAIL="$GITHUB_ACTOR@users.noreply.github.com"
+ else
+ echo "Using custom BOT_EMAIL"
+ BOT_EMAIL="$BOT_EMAIL_SECRET"
+ fi
+ echo "BOT_EMAIL=$BOT_EMAIL" >> $GITHUB_ENV
+ fi
+
+ if [ -z "$BOT_AUTHOR"]
+ then
+ if [ -z "$BOT_AUTHOR_SECRET" ]
+ then
+ echo "Using default BOT_NAME <BOT_EMAIL> as BOT_AUTHOR"
+ BOT_AUTHOR="$BOT_NAME <$BOT_EMAIL>"
+ else
+ echo "Using custom BOT_AUTHOR"
+ BOT_AUTHOR="$BOT_AUTHOR_SECRET"
+ fi
+ echo "BOT_AUTHOR=$BOT_AUTHOR" >> $GITHUB_ENV
+ fi

.github/workflows/dotnet-file.yml

@@ -9,18 +9,24 @@ on:
 
 env:
  DOTNET_NOLOGO: true
- GH_TOKEN: ${{ secrets.GH_TOKEN }}
 
 jobs:
  sync:
  runs-on: windows-latest
  steps:
- - name: 🔍 GH_TOKEN
- if: env.GH_TOKEN == ''
- shell: bash
- env: 
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- run: echo "GH_TOKEN=${GITHUB_TOKEN}" >> $GITHUB_ENV
+ - name: 🤘 checkout
+ uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
+ ref: main
+
+ - name: 🔍 defaults
+ uses: ./.github/workflows/defaults
+ env:
+ GH_TOKEN_SECRET: ${{ secrets.GH_TOKEN }}
+ BOT_NAME_SECRET: ${{ secrets.BOT_NAME }}
+ BOT_EMAIL_SECRET: ${{ secrets.BOT_EMAIL }}
+ BOT_AUTHOR_SECRET: ${{ secrets.BOT_AUTHOR }}
 
  - name: ⌛ rate
  shell: pwsh
@@ -38,13 +44,6 @@ jobs:
  echo "Rate limit has reset to $($rate.remaining) requests"
  }
 
- - name: 🤘 checkout
- uses: actions/checkout@v2
- with:
- fetch-depth: 0
- ref: main
- token: ${{ env.GH_TOKEN }}
-
  - name: 🔄 sync
  shell: pwsh
  run: |
@@ -70,9 +69,11 @@ jobs:
  branch: dotnet-file-sync
  delete-branch: true
  labels: dependencies
+ author: ${{ env.BOT_AUTHOR }}
+ committer: ${{ env.BOT_AUTHOR }}
  commit-message: ⬆️ Bump files with dotnet-file sync
 
  ${{ env.CHANGES }}
- title: "Bump files with dotnet-file sync"
+ title: "⬆️ Bump files with dotnet-file sync"
  body: ${{ env.CHANGES }}
- token: ${{ env.GH_TOKEN }}
+ token: ${{ env.GH_TOKEN }}

.github/workflows/includes.yml

@@ -1,4 +1,4 @@
-name: +M▼ includes
+name: +Mᐁ includes
 on: 
  workflow_dispatch:
  push:
@@ -23,13 +23,21 @@ jobs:
  ref: main
  token: ${{ env.BOT_TOKEN }}
 
- - name: +M▼ includes
+ - name: 🔍 defaults
+ uses: ./.github/workflows/defaults
+ env:
+ GH_TOKEN_SECRET: ${{ secrets.GH_TOKEN }}
+ BOT_NAME_SECRET: ${{ secrets.BOT_NAME }}
+ BOT_EMAIL_SECRET: ${{ secrets.BOT_EMAIL }}
+ BOT_AUTHOR_SECRET: ${{ secrets.BOT_AUTHOR }}
+
+ - name: +Mᐁ includes
  uses: devlooped/actions-include@v4
 
  - name: ✍ commit
  run: |
  git config --local user.name ${BOT_NAME}
  git config --local user.email ${BOT_EMAIL}
  git add .
- git commit -m "+M▼ includes" || exit 0
- git push
+ git commit -m "+Mᐁ includes" || exit 0
+ git push