Skip to content

Commit

Permalink
Merge branch 'ivankatliarchuk:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
ivankatliarchuk authored Dec 25, 2024
2 parents 2ee375b + 4058f0e commit b3e8514
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .github/workflow-templates/codeowners-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
steps:
- name: checkout code
if: steps.check.outputs.triggered == 'true'
uses: actions/[email protected].1
uses: actions/[email protected].7
with:
fetch-depth: '1'
submodules: 'recursive'

- name: check if merge was approved by code owner
if: steps.check.outputs.triggered == 'true'
uses: orta/[email protected].5
uses: orta/[email protected].6
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflow-templates/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
# To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
# change this to (see https://github.com/ruby/setup-ruby#versioning):
# uses: ruby/setup-ruby@v1
uses: ruby/setup-ruby@5f19ec79cedfadb78ab837f95b87734d0003c899
uses: ruby/setup-ruby@3783f195e29b74ae398d7caca108814bbafde90e
with:
ruby-version: 2.6
- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/00-release-draft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ jobs:
runs-on: ubuntu-latest
steps:

- uses: actions/checkout@v4.1.2
- uses: actions/checkout@v4.2.2
with:
fetch-depth: '0'

- name: check next version
uses: anothrNick/github-tag-action@1.67.0
uses: anothrNick/github-tag-action@1.71.0
id: tag
env:
DRY_RUN: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/01-renovate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
runs-on: ubuntu-latest
if: github.repository == 'ivankatliarchuk/.github'
steps:
- uses: actions/checkout@v4.1.2
- uses: actions/checkout@v4.2.2
with:
fetch-depth: '1'

Expand All @@ -45,7 +45,7 @@ jobs:

# https://github.com/renovatebot/github-action install renovate app
- name: execute-dependency-update
uses: renovatebot/github-action@v40.1.6
uses: renovatebot/github-action@v41.0.7
with:
configurationFile: ${{ env.RENOVATE_CONFIG_FOLDER }}/config.js
token: ${{ secrets.RENOVATE_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/additional-tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ jobs:
release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4.1.2
- uses: actions/checkout@v4.2.2
- uses: vweevers/additional-tags-action@v2
2 changes: 1 addition & 1 deletion .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
steps:

- name: automerge
uses: pascalgn/[email protected].2
uses: pascalgn/[email protected].4
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
MERGE_LABELS: 'automerge,✅ Approved'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeowners-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
steps:

- name: checkout code
uses: actions/checkout@v4.1.2
uses: actions/checkout@v4.2.2
with:
fetch-depth: '1'
submodules: 'recursive'

- name: check if merge was approved by code owner
uses: orta/[email protected].5
uses: orta/[email protected].6
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/governance.links-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ jobs:
if: github.repository == 'ivankatliarchuk/.github'
steps:
# checkout to latest commit
- uses: actions/checkout@v4.1.2
- uses: actions/checkout@v4.2.2
# run markdown linter

# todo https://github.com/peter-evans/link-checker
- name: link checker
id: lychee
uses: lycheeverse/lychee-action@v1.9.3
uses: lycheeverse/lychee-action@v2.2.0
# if: failure()
with:
args: >
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/synchronize.labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
# https://github.com/actions/checkout
- uses: actions/checkout@v4.1.2
- uses: actions/checkout@v4.2.2
# https://github.com/micnncim/action-label-syncer
- uses: micnncim/[email protected]
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4.1.2
- uses: actions/checkout@v4.2.2

- name: calculate date
id: envs
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v4.6.0
hooks:
- id: check-added-large-files
args: ['--maxkb=500']
Expand Down Expand Up @@ -53,7 +53,7 @@ repos:
hooks:
- id: shellcheck
- repo: https://github.com/ambv/black
rev: 24.3.0
rev: 24.4.2
hooks:
- id: black
language_version: python3.8
Expand Down Expand Up @@ -82,7 +82,7 @@ repos:
types: [file, yaml]
entry: 'yamllint --strict'
- repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
rev: v9.13.0
rev: v9.16.0
hooks:
- id: commitlint
stages: [commit-msg]
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SHELL := /bin/bash
MAKEFLAGS += --warn-undefined-variables
MAKEFLAGS += --no-builtin-rules

CI_RENOVATE_IMAGE := renovate/renovate:37.273.0-slim
CI_RENOVATE_IMAGE := renovate/renovate:37.413.4-slim
RENOVATE_REPOSITORIES := $(shell cat ./renovate/repositories.json | jq -r '. | join(",")')
RENOVATE_DRY_RUN := false
LOG_LEVEL := debug
Expand Down
5 changes: 3 additions & 2 deletions renovate/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,15 @@ module.exports = {
"separateMinorPatch": true,
"separateMultipleMajor": true,
"groupName": "{{datasource}} {{depType}} {{packageFile}}",
"addLabels": ["rule::4.1", "github-action", "skip-release"]
"addLabels": ["rule::4.1", "github-action", "skip-release"],
"versioning": "regex:^v(?<major>\\d+)(\\.(?<minor>\\d+))?(\\.(?<patch>\\d+))?"
},
{
"automerge": true,
// https://docs.renovatebot.com/configuration-options/#excluderepositories
"excludeRepositories": ["ivankatliarchuk/.github", "**/*-archived"],
"matchManagers": ["github-actions"],
"addLabels": ["rule::4.1"]
"addLabels": ["rule::4.1.1"]
},
{
"automerge": false,
Expand Down

0 comments on commit b3e8514

Please sign in to comment.