Skip to content

Commit

Permalink
Merge branch 'main' into feat/add-semantic-release
Browse files Browse the repository at this point in the history
  • Loading branch information
marcusrbrown committed Mar 18, 2024
2 parents 0364903 + aadf464 commit fe09c7d
Show file tree
Hide file tree
Showing 10 changed files with 112 additions and 86 deletions.
18 changes: 18 additions & 0 deletions .github/settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
_extends: .github:common-settings.yaml

repository:
name: works
description: '@bfra-me tools and components'
topics: works, bfra-me, tools, components, tsconfig, semantic-release

branches:
- name: main
protection:
required_status_checks:
strict: true
contexts: ['Test', 'Renovate / Renovate']
enforce_admins: true
required_pull_request_reviews: null
restrictions: null
required_linear_history: true
6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ name: CI
'on':
merge_group:
push:
branches: [main, 'renovate/**']
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
workflow_dispatch:
Expand All @@ -24,7 +23,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2

- name: Setup pnpm
uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d # v3.0.0
Expand Down Expand Up @@ -64,12 +63,13 @@ jobs:
application_id: ${{ secrets.APPLICATION_ID }}
application_private_key: ${{ secrets.APPLICATION_PRIVATE_KEY }}
permissions: 'contents:write, issues:write, pull_requests:write'
revoke_token: true
- name: Setup Git user
run: |
git config --global user.email '118100583+bfra-me[bot]@users.noreply.github.com'
git config --global user.name 'bfra-me[bot]'
- name: Checkout repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
with:
fetch-depth: 0
token: ${{ steps.get-workflow-access-token.outputs.token }}
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/renovate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,15 @@ name: Renovate
required: false
type: boolean
default: false
workflow_run:
workflows: ['CI']
branches: ['renovate/**']
types: [completed]

jobs:
renovate:
name: Renovate
secrets: inherit
uses: bfra-me/.github/.github/workflows/renovate.yaml@v1.8.2
uses: bfra-me/.github/.github/workflows/renovate.yaml@v1
with:
print_config: ${{ inputs.print_config || false }}
16 changes: 16 additions & 0 deletions .github/workflows/update-repo-settings.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Update repository settings to match the definitions in .github/settings.yml.
---
name: Update Repo Settings

'on':
push:
branches: [main]
schedule:
- cron: '02 18 * * *' # 18:02 UTC = 11:02 AM PST
workflow_dispatch:

jobs:
update-repo-settings:
name: Update Repo Settings
secrets: inherit
uses: bfra-me/.github/.github/workflows/update-repo-settings.yaml@v1
4 changes: 2 additions & 2 deletions .markdownlint-cli2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ config:
MD013: false
MD033:
allowed_elements: [a, h3, img, p]
# MD041: false
MD041: false

globs:
- '**/*.md'
- '!.changeset'
- '!.changeset/**'
- '!**/node_modules'
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@bfra.me/works",
"version": "0.0.0",
"private": true,
"packageManager": "pnpm@8.15.4",
"packageManager": "pnpm@8.15.5",
"description": "bfra.me tools and components",
"scripts": {
"bootstrap": "pnpm install --frozen-lockfile && pnpm -r build",
Expand Down Expand Up @@ -36,12 +36,12 @@
"@bfra.me/tsconfig": "workspace:*",
"@changesets/cli": "2.27.1",
"@swisspost/design-system-changelog-github": "1.0.2",
"@types/node": "20.11.25",
"@types/node": "20.11.28",
"eslint": "8.57.0",
"prettier": "3.2.5",
"rimraf": "5.0.5",
"ts-node": "10.9.2",
"typescript": "5.3.3"
"typescript": "5.4.2"
},
"pnpm": {
"overrides": {
Expand Down
6 changes: 6 additions & 0 deletions packages/tsconfig/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @bfra.me/tsconfig

## 0.2.5

### Patch Changes

- `package.json`: Update `homepage`, add `keywords`, and extend `exports` (by [@marcusrbrown](https://github.com/marcusrbrown) with [#148](https://github.com/bfra-me/works/pull/148))

## 0.2.4

### Patch Changes
Expand Down
9 changes: 6 additions & 3 deletions packages/tsconfig/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@bfra.me/tsconfig",
"description": "Shared TypeScript configuration for bfra.me",
"version": "0.2.4",
"version": "0.2.5",
"author": "Marcus R. Brown <contact@bfra.me>",
"license": "MIT",
"type": "module",
"main": "tsconfig.json",
"homepage": "https://github.com/bfra-me/works/blob/main/packages/tsconfig#readme",
"homepage": "https://github.com/bfra-me/works/tree/main/packages/tsconfig#readme",
"repository": {
"directory": "packages/tsconfig",
"type": "git",
Expand All @@ -15,6 +15,7 @@
"bugs": "https://github.com/bfra-me/works/issues",
"keywords": [
"bfra.me",
"works",
"typescript",
"tsconfig",
"config",
Expand All @@ -28,7 +29,9 @@
"tsconfig.json"
],
"exports": {
".": "./tsconfig.json"
".": "./tsconfig.json",
"./package.json": "./package.json",
"./tsconfig.json": "./tsconfig.json"
},
"devDependencies": {
"@bfra.me/tsconfig": "workspace:*",
Expand Down
Loading

0 comments on commit fe09c7d

Please sign in to comment.