Skip to content

Commit

Permalink
chore: fix lint + cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
mircea-pavel-anton committed Aug 12, 2024
1 parent 331334a commit a12740c
Show file tree
Hide file tree
Showing 18 changed files with 167 additions and 153 deletions.
4 changes: 0 additions & 4 deletions .github/configs/labels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
- name: area/taskfile
color: "0e8a16"


# =================================================================================================
# Renovate Types
# =================================================================================================
Expand All @@ -24,7 +23,6 @@
- name: renovate/github-action
color: "027fa0"


# =================================================================================================
# Semantic Types
# =================================================================================================
Expand All @@ -37,7 +35,6 @@
- name: type/major
color: "f6412d"


# =================================================================================================
# Size Types
# =================================================================================================
Expand All @@ -54,7 +51,6 @@
- name: size/XXL
color: "ff00ff"


# =================================================================================================
# Issue Types
# =================================================================================================
Expand Down
6 changes: 5 additions & 1 deletion .github/configs/lychee.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@ include_verbatim = false
glob_ignore_case = false

# Exclude URLs and mail addresses from checking (supports regex).
exclude = ['^https://fonts\.googleapis\.com/', '^https://fonts\.gstatic\.com/', '^https://www\.linkedin\.com']
exclude = [
'^https://fonts\.googleapis\.com/',
'^https://fonts\.gstatic\.com/',
'^https://www\.linkedin\.com',
]

# Exclude these filesystem paths from getting checked.
exclude_path = []
Expand Down
38 changes: 30 additions & 8 deletions .github/configs/renovate/autoMerge.json5
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,42 @@
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"packageRules": [
{
"description": ["Auto-merge container updates for trusted containers"],
"matchDatasources": ["docker"],
"description": [
"Auto-merge container updates for trusted containers"
],
"matchDatasources": [
"docker"
],
"automerge": true,
"automergeType": "pr",
"matchUpdateTypes": ["digest", "patch", "minor", "major"],
"matchPackagePatterns": ["nginx", "ruby", "mcr.microsoft.com/devcontainers/jekyll"]
"matchUpdateTypes": [
"digest",
"patch",
"minor",
"major"
],
"matchPackagePatterns": [
"nginx",
"ruby",
"mcr.microsoft.com/devcontainers/jekyll"
]
},
{
"description": ["Auto-merge GitHub Actions for minor and patch"],
"matchManagers": ["github-actions"],
"matchDatasources": ["github-tags"],
"description": [
"Auto-merge GitHub Actions for minor and patch"
],
"matchManagers": [
"github-actions"
],
"matchDatasources": [
"github-tags"
],
"automerge": true,
"automergeType": "pr",
"matchUpdateTypes": ["minor", "patch"]
"matchUpdateTypes": [
"minor",
"patch"
]
}
]
}
57 changes: 49 additions & 8 deletions .github/configs/renovate/labels.json5
Original file line number Diff line number Diff line change
@@ -1,12 +1,53 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"packageRules": [
{ "matchUpdateTypes": ["major"], "labels": ["type/major"] },
{ "matchUpdateTypes": ["minor"], "labels": ["type/minor"] },
{ "matchUpdateTypes": ["patch"], "labels": ["type/patch"] },

{ "matchDatasources": ["docker"], "addLabels": ["renovate/container"] },
{ "matchDatasources": ["rubygems"], "addLabels": ["renovate/ruby"] },
{ "matchManagers": ["github-actions"], "addLabels": ["renovate/github-action"] }
{
"matchUpdateTypes": [
"major"
],
"labels": [
"type/major"
]
},
{
"matchUpdateTypes": [
"minor"
],
"labels": [
"type/minor"
]
},
{
"matchUpdateTypes": [
"patch"
],
"labels": [
"type/patch"
]
},
{
"matchDatasources": [
"docker"
],
"addLabels": [
"renovate/container"
]
},
{
"matchDatasources": [
"rubygems"
],
"addLabels": [
"renovate/ruby"
]
},
{
"matchManagers": [
"github-actions"
],
"addLabels": [
"renovate/github-action"
]
}
]
}
}
57 changes: 40 additions & 17 deletions .github/configs/renovate/semanticCommits.json5
Original file line number Diff line number Diff line change
Expand Up @@ -5,56 +5,79 @@
// Docker
// ============================================================================================
{
"matchDatasources": ["docker"],
"matchUpdateTypes": ["major"],
"matchDatasources": [
"docker"
],
"matchUpdateTypes": [
"major"
],
"commitMessagePrefix": "deps(docker)!: ",
"commitMessageTopic": "{{depName}}",
"commitMessageExtra": " ( {{currentVersion}} → {{newVersion}} )"
},
{
"matchDatasources": ["docker"],
"matchUpdateTypes": ["minor", "patch"],
"matchDatasources": [
"docker"
],
"matchUpdateTypes": [
"minor",
"patch"
],
"commitMessagePrefix": "deps(docker): ",
"commitMessageTopic": "{{depName}}",
"commitMessageExtra": " ( {{currentVersion}} → {{newVersion}} )"
},


// ============================================================================================
// Ruby
// ============================================================================================
{
"matchDatasources": ["rubygems"],
"matchUpdateTypes": ["major"],
"matchDatasources": [
"rubygems"
],
"matchUpdateTypes": [
"major"
],
"commitMessagePrefix": "deps(ruby)!: ",
"commitMessageTopic": "{{depName}}",
"commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )"
},
{
"matchDatasources": ["rubygems"],
"matchUpdateTypes": ["minor", "patch"],
"matchDatasources": [
"rubygems"
],
"matchUpdateTypes": [
"minor",
"patch"
],
"commitMessagePrefix": "deps(ruby): ",
"commitMessageTopic": "{{depName}}",
"commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )"
},


// ============================================================================================
// GitHub Actions
// ============================================================================================
{
"matchManagers": ["github-actions"],
"matchUpdateTypes": ["major"],
"matchManagers": [
"github-actions"
],
"matchUpdateTypes": [
"major"
],
"commitMessagePrefix": "deps(actions)!: ",
"commitMessageTopic": "{{depName}}",
"commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )"
},
{
"matchManagers": ["github-actions"],
"matchUpdateTypes": ["minor", "patch"],
"matchManagers": [
"github-actions"
],
"matchUpdateTypes": [
"minor",
"patch"
],
"commitMessagePrefix": "deps(actions): ",
"commitMessageTopic": "{{depName}}",
"commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )"
}
]
}
}
6 changes: 0 additions & 6 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",

"dependencyDashboardTitle": "Renovate Dashboard 🤖",

"extends": [
":dependencyDashboard",

":timezone(Europe/Bucharest)",

"config:best-practices",
"docker:enableMajor",
":disableRateLimiting",
":semanticCommits",

"github>mirceanton/centralized-workflows//.github/configs/renovate/devcontainerNoDigest.json5",

"github>mirceanton/mirceanton.com//.github/configs/renovate/autoMerge.json5",
"github>mirceanton/mirceanton.com//.github/configs/renovate/labels.json5",
"github>mirceanton/mirceanton.com//.github/configs/renovate/semanticCommits.json5"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ on:
- "Dockerfile"
- ".github/workflows/docker.yaml"
push:
tags: [ "*" ]
tags: ["*"]

jobs:
build:
uses: mirceanton/reusable-workflows/.github/workflows/docker-release.yaml@main
secrets: inherit
with:
image-name: ghcr.io/${{ github.repository }}
platforms: linux/amd64, linux/arm64
custom-tag: ${{ inputs.custom-tag }}
secrets: inherit
4 changes: 2 additions & 2 deletions .github/workflows/git-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ name: Release
on:
workflow_dispatch: {}
push:
branches: [ "main" ]
paths: [ "website/**", "Dockerfile" ]
branches: ["main"]
paths: ["website/**", "Dockerfile"]

jobs:
release:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/link-checker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Link Checker
on:
workflow_dispatch: {}
push:
branches: [ "main" ]
branches: ["main"]
paths:
- ".github/workflows/link-checker.yaml"
- "website/**"
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:

link-checker:
runs-on: ubuntu-latest
needs: [ build-site ]
needs: [build-site]
steps:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/meta-label-sync.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
name: Label Sync

on:
workflow_dispatch: {} # Manual Trigger
workflow_dispatch: {} # Manual Trigger
push:
branches: [ "main" ]
paths: [ ".github/labels.yaml" ]
branches: ["main"]
paths: [".github/labels.yaml"]
schedule:
- cron: "0 0 * * *" # Every day at midnight

Expand All @@ -16,6 +16,6 @@ permissions:
jobs:
label-sync:
uses: mirceanton/reusable-workflows/.github/workflows/meta-label-sync.yaml@main
secrets: inherit
with:
config-file: .github/configs/labels.yaml
secrets: inherit
6 changes: 3 additions & 3 deletions .github/workflows/meta-labeler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
name: Labeler

on:
workflow_dispatch: {} # Manual Trigger
workflow_dispatch: {} # Manual Trigger
pull_request_target:
branches: [ "main" ]
branches: ["main"]

jobs:
labeler:
uses: mirceanton/reusable-workflows/.github/workflows/meta-labeler.yaml@main
secrets: inherit
with:
config-file: .github/configs/labeler.yaml
secrets: inherit
4 changes: 2 additions & 2 deletions .github/workflows/renovate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
default: debug
required: false
schedule:
- cron: "0 * * * *" # hourly
- cron: "0 * * * *" # hourly

concurrency:
group: ${{ github.workflow }}-${{ github.event.number || github.ref }}
Expand All @@ -22,7 +22,7 @@ concurrency:
jobs:
renovate:
uses: mirceanton/reusable-workflows/.github/workflows/renovate.yaml@main
secrets: inherit
with:
dryRun: "${{ inputs.dryRun == true }}"
logLevel: "${{ inputs.logLevel || 'debug' }}"
secrets: inherit
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ package-lock.json
# Misc
assets/js/dist

.jekyll-metadata
.jekyll-metadata
Loading

0 comments on commit a12740c

Please sign in to comment.