Skip to content

Commit

Permalink
Manual sync with action_template
Browse files Browse the repository at this point in the history
  • Loading branch information
ebronson68 committed Jan 17, 2024
1 parent c83c498 commit d0104dd
Show file tree
Hide file tree
Showing 11 changed files with 209 additions and 55 deletions.
70 changes: 39 additions & 31 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,51 +2,59 @@
* @Andrews-McMeel-Universal/devops-engineers

# Front-end Engineering
# *.html @Andrews-McMeel-Universal/front-end-engineers
# *.lock @Andrews-McMeel-Universal/front-end-engineers
# *.js @Andrews-McMeel-Universal/front-end-engineers
# *.jsx @Andrews-McMeel-Universal/front-end-engineers
# *.ts @Andrews-McMeel-Universal/front-end-engineers
# *.tsx @Andrews-McMeel-Universal/front-end-engineers
# *.css @Andrews-McMeel-Universal/front-end-engineers
# *.less @Andrews-McMeel-Universal/front-end-engineers
# *.scss @Andrews-McMeel-Universal/front-end-engineers
# *.sass @Andrews-McMeel-Universal/front-end-engineers
# *.otf @Andrews-McMeel-Universal/front-end-engineers
# *.eot @Andrews-McMeel-Universal/front-end-engineers
# *.ttf @Andrews-McMeel-Universal/front-end-engineers
# *.woff* @Andrews-McMeel-Universal/front-end-engineers
# *.svg @Andrews-McMeel-Universal/front-end-engineers
# *.jpg @Andrews-McMeel-Universal/front-end-engineers
# *.jpeg @Andrews-McMeel-Universal/front-end-engineers
# *.gif @Andrews-McMeel-Universal/front-end-engineers
# *.png @Andrews-McMeel-Universal/front-end-engineers
# *.ico @Andrews-McMeel-Universal/front-end-engineers
# public/** @Andrews-McMeel-Universal/front-end-engineers
# src/** @Andrews-McMeel-Universal/front-end-engineers
# .storybook/** @Andrews-McMeel-Universal/front-end-engineers
# **/*.html @Andrews-McMeel-Universal/front-end-engineers
# **/*.lock @Andrews-McMeel-Universal/front-end-engineers
# **/*.js @Andrews-McMeel-Universal/front-end-engineers
# **/*.jsx @Andrews-McMeel-Universal/front-end-engineers
# **/*.ts @Andrews-McMeel-Universal/front-end-engineers
# **/*.less @Andrews-McMeel-Universal/front-end-engineers
# **/*.scss @Andrews-McMeel-Universal/front-end-engineers
# **/*.sass @Andrews-McMeel-Universal/front-end-engineers
# **/*.otf @Andrews-McMeel-Universal/front-end-engineers
# **/*.eot @Andrews-McMeel-Universal/front-end-engineers
# **/*.svg @Andrews-McMeel-Universal/front-end-engineers
# **/*.jpg @Andrews-McMeel-Universal/front-end-engineers
# **/*.jpeg @Andrews-McMeel-Universal/front-end-engineers
# **/*.gif @Andrews-McMeel-Universal/front-end-engineers
# **/*.png @Andrews-McMeel-Universal/front-end-engineers
# **/*.css @Andrews-McMeel-Universal/front-end-engineers
# **/*.woff @Andrews-McMeel-Universal/front-end-engineers
# **/*.woff2 @Andrews-McMeel-Universal/front-end-engineers
# **/*.ttf @Andrews-McMeel-Universal/front-end-engineers
# **/*.ico @Andrews-McMeel-Universal/front-end-engineers
# **/*.tsx @Andrews-McMeel-Universal/front-end-engineers
# .nvmrc @Andrews-McMeel-Universal/front-end-engineers
# .npmrc @Andrews-McMeel-Universal/front-end-engineers
# public/ @Andrews-McMeel-Universal/front-end-engineers
# src/ @Andrews-McMeel-Universal/front-end-engineers
# .storybook/ @Andrews-McMeel-Universal/front-end-engineers
# wp-content/ @Andrews-McMeel-Universal/front-end-engineers
# .browserslistrc @Andrews-McMeel-Universal/front-end-engineers
# **eslint** @Andrews-McMeel-Universal/front-end-engineers
# **jest** @Andrews-McMeel-Universal/front-end-engineers
# **prettier** @Andrews-McMeel-Universal/front-end-engineers
# **stylelint** @Andrews-McMeel-Universal/front-end-engineers
# **/src/assets/** @Andrews-McMeel-Universal/front-end-engineers
# **/src/src/** @Andrews-McMeel-Universal/front-end-engineers
# **/src/amu/** @Andrews-McMeel-Universal/front-end-engineers
# src/src/ @Andrews-McMeel-Universal/front-end-engineers
# src/amu/ @Andrews-McMeel-Universal/front-end-engineers
# src/assets/ @Andrews-McMeel-Universal/front-end-engineers

# Back-end Engineering
# **.cs @Andrews-McMeel-Universal/back-end-engineers
# **.csproj @Andrews-McMeel-Universal/back-end-engineers
# **.sln @Andrews-McMeel-Universal/back-end-engineers
# data/** @Andrews-McMeel-Universal/back-end-engineers
# *.cs @Andrews-McMeel-Universal/back-end-engineers
# *.csproj @Andrews-McMeel-Universal/back-end-engineers
# *.sln @Andrews-McMeel-Universal/back-end-engineers
# *.rb @Andrews-McMeel-Universal/back-end-engineers
# *.ru @Andrews-McMeel-Universal/back-end-engineers
# *.Library/ @Andrews-McMeel-Universal/back-end-engineers
# *.Tests/ @Andrews-McMeel-Universal/back-end-engineers
# *.WebAPI/ @Andrews-McMeel-Universal/back-end-engineers
# *.UnitTests/ @Andrews-McMeel-Universal/back-end-engineers
# *.Models/ @Andrews-McMeel-Universal/back-end-engineers

# DevOps
.github/ @Andrews-McMeel-Universal/devops-engineers
deployments/ @Andrews-McMeel-Universal/devops-engineers
deployments/**/templates/ @Andrews-McMeel-Universal/devops-engineers
deployments/**/.helmignore @Andrews-McMeel-Universal/devops-engineers
deployments/**/values.yaml @Andrews-McMeel-Universal/devops-engineers
*-Secrets.ps1 @Andrews-McMeel-Universal/devops-engineers
Dockerfile @Andrews-McMeel-Universal/devops-engineers
docker-compose.yml @Andrews-McMeel-Universal/devops-engineers
Expand Down
23 changes: 22 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,31 @@ updates:
- "front-end"
- "dependencies"
versioning-strategy: increase
open-pull-requests-limit: 10
commit-message:
# Prefix all commit messages with 'npm'
prefix: "npm"
# Create a group of dependencies to be updated together in one pull request
groups:
# Specify a name for the group, which will be used in pull request titles
# and branch names
dependencies-major:
# Open a PR with all major version updates from "dependencies" in package.json
dependency-type: "production"
update-types:
- "major"
dependencies-minor:
# Open a PR with all minor version updates from "dependencies" in package.json
dependency-type: "production"
update-types:
- "minor"
dependencies-patch:
# Open a PR with all patch version updates from "dependencies" in package.json
dependency-type: "production"
update-types:
- "patch"
devDependencies:
# Open a PR with all updates from "devDependencies" in package.json
dependency-type: "development"

- package-ecosystem: bundler
directory: "/"
Expand Down
95 changes: 95 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
name-template: '$RESOLVED_VERSION'
tag-template: '$RESOLVED_VERSION'
categories:
- title: 🐛 Fixes
labels:
- 'bug'
- title: 📝 Documentation
labels:
- 'documentation'
- title: 🔨 Maintenance
labels:
- 'tools'
- 'tests'
- 'dependencies'
- title: 🔐 DevOps
labels:
- 'sync'
- 'devops'
exclude-labels:
- 'skip-changelog'
change-template: '- $TITLE by @$AUTHOR in #$NUMBER'
change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
exclude-contributors:
- 'dependabot[bot]'
- 'amutechtest'
- 'github-actions'
autolabeler:
- label: 'documentation'
files:
- '**/*.md'
- label: 'dependencies'
files:
- "{yarn,Gemfile}.lock"
- "package*.json"
- "Gemfile"
- ".ruby-{version,gemset}"
- "**/*.csproj"
- "**/pnpm-lock.yaml"
- ".yarn/"
- ".{npm,nvm}rc"
- label: 'front-end'
files:
- "**/*.{js,js.html,jsx,ts,tsx,html,css,less,scss,sass,otf,eot,ttf,woff*}"
- "public/"
- "src/"
- "wp-content/"
- ".storybook/"
- "package.json"
- "!/.vscode"
- "!/.devcontainer"
- "!**/*.test.js"
- label: 'back-end'
files:
- "**/*.{cs,sln,csproj,rb,ru}"
- label: 'tools'
files:
- "/.vscode"
- "/.devcontainer"
- "stylelint.config.js"
- ".{prettierrc,size-limit,eslintrc}.js"
- ".{yamllint,yarnrc,mega-linter,solargraph,postcssrc,erb-lint,rubocop}.yml"
- ".{jscpd,markdownlint,babel.config,prettierrc,eslintrc,stylelintrc}.json"
- label: 'tests'
files:
- "playwright/**"
- "cypress/**"
- ".spec.*"
- "*.test.js"
- "{jest,playwright}.*.js"
- label: 'devops'
files:
- ".github/"
- "deployments/"
- "*.ps1"
- "Secrets-example.json"
- "docker-compose.yml"
- "Dockerfile"
include-pre-releases: true
version-resolver:
major:
labels:
- 'major'
minor:
labels:
- 'minor'
patch:
labels:
- 'patch'
default: patch
template: |
## What's Changed
$CHANGES
**Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...$RESOLVED_VERSION
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,18 @@ permissions:
contents: write
repository-projects: write

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
dependabot-automations:
if: ${{ github.actor == 'dependabot[bot]' }}
name: Dependabot PR Automations
uses: Andrews-McMeel-Universal/reusable_workflows/.github/workflows/dependabot-automations.yaml@2
with:
autoApprove: true
autoMerge: false
autoApprove: ${{ vars.DEPENDABOT_AUTOAPPROVE || '["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]' }}
autoMerge: ${{ vars.DEPENDABOT_AUTOMERGE || 'false' }}

required-checks:
name: Required Checks
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
name: PR Checks
name: Linters

on:
pull_request:
types: [opened, synchronize, reopened]

jobs:
pr-labels:
if: ${{ github.actor != 'dependabot[bot]' }}
name: PR Labels
uses: Andrews-McMeel-Universal/reusable_workflows/.github/workflows/pr-labels.yaml@2
secrets:
PAT_ACTION_CI: ${{ secrets.PAT_ACTION_CI }}

codeowners-validation:
if: ${{ github.actor != 'dependabot[bot]' }}
name: Codeowners File Validation
Expand All @@ -31,5 +24,8 @@ jobs:
if: ${{ github.actor != 'dependabot[bot]' }}
name: Simple Lint
uses: Andrews-McMeel-Universal/reusable_workflows/.github/workflows/simple-lint.yaml@2
with:
runPrettier: ${{ vars.SIMPLE_LINT_RUN_PRETTIER != 'false' }}
prettierPlugins: ${{ vars.INSTALL_PRETTIER_PLUGINS }}
secrets:
PAT_ACTION_CI: ${{ secrets.PAT_ACTION_CI }}
22 changes: 22 additions & 0 deletions .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: 📄 Create Release Draft

on:
push:
branches:
- main
pull_request:
types: [opened, reopened, synchronize]

permissions:
contents: write
pull-requests: write

jobs:
update-release-draft:
name: Update Release Draft
runs-on: ubuntu-latest
steps:
- name: Draft Release Notes
uses: release-drafter/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 🔄 Sync with action_template repository
name: 🔄 Sync with template repository

on:
schedule:
Expand All @@ -24,12 +24,12 @@ jobs:
uses: AndreasAugustin/actions-template-sync@v1.1.1
with:
github_token: ${{ secrets.PAT_ACTION_CI }}
source_repo_path: Andrews-McMeel-Universal/action_template
upstream_branch: main
source_repo_path: Andrews-McMeel-Universal/${{ vars.SYNC_REPO }}
upstream_branch: ${{ vars.SYNC_REPO_BRANCH || 'main' }}
pr_labels: sync
pr_commit_msg: 🔄 Synchronize with @Andrews-McMeel-Universal/action_template
pr_title: 🔄 Sync with @Andrews-McMeel-Universal/action_template
pr_branch_name_prefix: sync/action_template/
pr_commit_msg: 🔄 Synchronize with @Andrews-McMeel-Universal/${{ vars.SYNC_REPO }}
pr_title: 🔄 Sync with @Andrews-McMeel-Universal/${{ vars.SYNC_REPO }}
pr_branch_name_prefix: sync/
pr_reviewers: Andrews-McMeel-Universal/devops-engineers
is_dry_run: ${{ inputs.isdryrun || 'false' }}
git_user_name: amutechtest
Expand Down
File renamed without changes.
11 changes: 6 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,9 @@ wp-content/shield/

# Ignore compiled storybook directory
/storybook-static
.storybook/main.js
.storybook/preview-body.html
.storybook/preview.js

# Ignore uploaded files in development
/storage/*
Expand All @@ -234,6 +237,7 @@ wp-content/shield/
next.config.original.js
next.config.wizardcopy.js
/build
public/sitemap*.xml

# Runtime data
pids
Expand Down Expand Up @@ -722,10 +726,6 @@ FodyWeavers.xsd
/.pnp
.pnp.js

# generated during build
robots.txt
sitemap*.xml

# misc
.DS_Store

Expand Down Expand Up @@ -765,4 +765,5 @@ terraform/.terraform.lock.hcl
terraform/.terraform/
terraform/*.tfstate*
terraform/*.tfplan
terraform/variables.tf
terraform/variables.tf
terraform/*.key
11 changes: 9 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# General
.cache/
.git/

.vscode/
.idea/

# GitHub Actions Workflows
.github/
Expand All @@ -21,8 +22,14 @@ playwright-report/
test-results/
**.js.map
**.bundle.js
storybook-static
storybook-static/
src/helpers/utilities/tokens/_design_tokens.js
*.tsbuildinfo
**/vendor
/tests/
**/.test.
# Project Specific Ignores
src/design-system-package/dist/**

# WordPress
wp-content/
Expand Down

0 comments on commit d0104dd

Please sign in to comment.