Skip to content

Commit

Permalink
Merge branch 'trikset:master' into translations
Browse files Browse the repository at this point in the history
  • Loading branch information
kleo-53 authored Jan 26, 2024
2 parents 80931b5 + e5d6d9f commit c3247f2
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 9 deletions.
16 changes: 13 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ updates:
directory: "/"
schedule:
interval: monthly
time: "23:59"
timezone: Europe/Moscow
open-pull-requests-limit: 99
reviewers:
- iakov
assignees:
Expand All @@ -15,3 +12,16 @@ updates:
submodules:
patterns:
- "*" # All submodules updates

- package-ecosystem: github-actions
directory: "/"
schedule:
interval: monthly
reviewers:
- iakov
assignees:
- iakov
groups:
github-actions:
patterns:
- "*" # All submodules updates
4 changes: 2 additions & 2 deletions .github/workflows/centos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
steps:

- name: Cancel Previous Workflow Runs
uses: n1hility/cancel-previous-runs@v2.0
uses: n1hility/cancel-previous-runs@v3.0
with:
token: ${{ secrets.GITHUB_TOKEN }}

Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
echo "${Qt5_Dir}/bin" >> $GITHUB_PATH
- name: Use ccache
uses: hendrikmuhs/[email protected]
uses: hendrikmuhs/[email protected].11

- name: Check available tools
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
steps:

- name: Cancel Previous Workflow Runs
uses: n1hility/cancel-previous-runs@v2.0
uses: n1hility/cancel-previous-runs@v3.0
with:
token: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -37,7 +37,7 @@ jobs:
git config --global core.symlinks true
git config --global core.autocrlf true
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 1
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:

# After Qt install action, that spoils pythonLocation variable
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
architecture: 'x86'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trik-toolchain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
echo "PERL5LIB=$PERL5LIB" >> $GITHUB_ENV
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: recursive
Expand Down

0 comments on commit c3247f2

Please sign in to comment.