Skip to content

Commit

Permalink
Merge pull request #2 from Andrews-McMeel-Universal/sync/action_templ…
Browse files Browse the repository at this point in the history
…ate/_75bc894

🔄 Sync with @Andrews-McMeel-Universal/action_template
  • Loading branch information
ebronson68 authored Nov 2, 2023
2 parents 4063352 + cf36423 commit c83c498
Show file tree
Hide file tree
Showing 10 changed files with 44 additions and 39 deletions.
5 changes: 2 additions & 3 deletions .github/.templatesyncignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.github/CODEOWNERS
.github/workflows/template-sync.yml
*.ps1
README.md
Secrets-example.json
action.yaml
README.md
14 changes: 7 additions & 7 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<!--
We appreciate the effort for this pull request but before that please make sure you read the contribution guidelines, then fill out the blanks below.
<!-- Please make sure you read the contribution guidelines and then fill out the blanks below.
Please format the PR title appropriately based on the type of change:
[<issue>]: <description>
Where <issue> is the related Jira Issue Key.
[JIRA-XXX]: <description>
-->

## Description

<!-- Provide a description here -->

## Related Issues
## Related Links

<!-- List any related Jira issues here -->
<!-- List any links related to this pull request here
- Jira Issue: PROJECT-<num>
Replace "JIRA-XXX" with the your Jira issue key -->

- Jira Issue: JIRA-XXX
13 changes: 10 additions & 3 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
changelog:
categories:
- title: General Changes
- title: 🌐 General Changes
labels:
- "*"
exclude:
authors:
- dependabot
- title: DevOps Changes
labels:
- sync
- devops
- title: 🔨 DevOps Changes
labels:
- devops
exclude:
labels:
- dependencies
- title: Dependencies
- sync
- title: 🔄 Template Syncs
labels:
- sync
- title: ⬆️ Dependencies
labels:
- dependencies
6 changes: 1 addition & 5 deletions .github/workflows/dependabot-automations.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Dependabot Automations
name: 🤖 Dependabot Automations

on:
pull_request_target:
Expand All @@ -10,10 +10,6 @@ permissions:
contents: write
repository-projects: write

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

jobs:
dependabot-automations:
if: ${{ github.actor == 'dependabot[bot]' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-checks.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: PR Checks
name: PR Checks

on:
pull_request:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-clean-caches.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Cleanup caches
name: 🗑️ Cleanup caches

on:
pull_request:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/template-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 🔄 Sync with action_template repository

on:
schedule:
- cron: 0 9 1 * *
- cron: 0 9 1 JAN,APR,JUL,OCT *
workflow_dispatch:
inputs:
isdryrun:
Expand All @@ -26,7 +26,7 @@ jobs:
github_token: ${{ secrets.PAT_ACTION_CI }}
source_repo_path: Andrews-McMeel-Universal/action_template
upstream_branch: main
pr_labels: maintenance
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/
Expand Down
30 changes: 18 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -267,9 +267,15 @@ jscpd-report.json
# Output of 'npm pack'
*.tgz

# Yarn Integrity file
# Yarn Package Management
.yarn-integrity
yarn-error.log
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions

# Configs
configFile.json
Expand Down Expand Up @@ -465,9 +471,6 @@ nCrunchTemp_*
*.mm.*
AutoTest.Net/

# Web workbench (sass)
.sass-cache/

# Installshield output folder
[Ee]xpress/

Expand Down Expand Up @@ -588,7 +591,6 @@ FakesAssemblies/

# Node.js Tools for Visual Studio
.ntvs_analysis.dat
node_modules/

# Visual Studio 6 build log
*.plg
Expand All @@ -606,10 +608,6 @@ node_modules/
*.dsw
*.dsp

# Visual Studio 6 technical files
*.ncb
*.aps

# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
Expand Down Expand Up @@ -694,10 +692,7 @@ FodyWeavers.xsd

# Windows Installer files from build outputs
*.cab
*.msi
*.msix
*.msm
*.msp

# JetBrains Rider
*.sln.iml
Expand Down Expand Up @@ -760,3 +755,14 @@ Secrets.json
# Azure B2C
/**/src/custom-policies/B2C_1A_*_*_SIGNINSIGNOUT_*.xml
/custom-policies/**/B2C_1A_*_*_SIGNINSIGNOUT_*.xml

# Azure Functions
*.Functions/Properties/ServiceDependencies/*/*.json
*.Functions/Properties/serviceDependencies.*.json

# Terraform
terraform/.terraform.lock.hcl
terraform/.terraform/
terraform/*.tfstate*
terraform/*.tfplan
terraform/variables.tf
5 changes: 1 addition & 4 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@


# GitHub Actions Workflows
.github/dependabot.yml
.github/labeler.yml
.github/workflows/aks*.yml
.github/release.yml
.github/

# Helm
deployments/**/templates/
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Action Template

Yyarn Install composite action for yarn 3/4+ and "nodeLinker: node-modules"
Yarn Install composite action for yarn 3/4+ and "nodeLinker: node-modules"

Reference: https://gist.github.com/belgattitude/042f9caf10d029badbde6cf9d43e400a

Expand Down

0 comments on commit c83c498

Please sign in to comment.