Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/2.4' into minimixxx
Browse files Browse the repository at this point in the history
  • Loading branch information
ywwg committed Jan 6, 2024
2 parents 4499870 + 64852f6 commit 477902c
Show file tree
Hide file tree
Showing 4,751 changed files with 1,809,046 additions and 218,072 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
18 changes: 8 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,24 @@ jobs:
runs-on: ubuntu-latest
if: github.event_name == 'push' || github.event_name == 'repository_dispatch'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: main
fetch-depth: 0
- name: Setup Graphviz
run: sudo apt update && sudo apt install -y graphviz
- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: '3.7'
- name: Install Python dependencies
run: pip install --upgrade -r requirements.txt
- name: Build versioned HTML manual
run: sh build_html.sh
- name: Publish
uses: netlify/actions/cli@master
with:
# Increase timeout to 30 minutes because deploying the manual may take
# a while.
args: deploy --prod --dir=build/html --timeout 1800
- name: Deploy to Netlify
# Increase timeout to 30 minutes because deploying the manual may take
# a while.
run: npx netlify deploy --prod --dir=build/html --timeout 1800
env:
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
Expand All @@ -43,7 +41,7 @@ jobs:
name: PDF
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup PDF Build Dependencies
run: >
sudo apt-get update && sudo apt-get install -y
Expand All @@ -58,7 +56,7 @@ jobs:
latexmk
xindy
- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: '3.7'
- name: Install Python dependencies
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ jobs:
- name: Event Information
run: echo "Event '${{ github.event.action }}' received from '${{ github.event.client_payload.repository }}'"
- name: Check out repository
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
ref: ${{ github.event.client_payload.branch }}
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.9
- name: Install Python dependencies
Expand All @@ -34,7 +34,7 @@ jobs:
run: tools/update_changelog.py -b "${{ github.event.client_payload.branch }}"
- name: Check if changes any changes were made
run: echo "GIT_DIRTY=$(git diff --quiet ; printf "%d" "$?")" >> "${GITHUB_ENV}"
- uses: EndBug/add-and-commit@v7
- uses: EndBug/add-and-commit@v9
if: env.GIT_DIRTY != null && env.GIT_DIRTY != '0'
with:
branch: ${{ github.event.client_payload.branch }}
Expand All @@ -46,7 +46,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Trigger Rebuild
uses: peter-evans/repository-dispatch@v1
uses: peter-evans/repository-dispatch@v2
if: env.GIT_DIRTY != null && env.GIT_DIRTY != '0' && env.MIXXXBOT_TOKEN != null
with:
token: ${{ env.MIXXXBOT_TOKEN }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: pre-commit/action@v2.0.0
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- uses: pre-commit/action@v3.0.0
env:
SKIP: rstcheck

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

- name: "Upload patch artifact"
if: failure() && env.UPLOAD_PATCH_FILE != null
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: ${{ env.UPLOAD_PATCH_FILE }}
path: ${{ env.UPLOAD_PATCH_FILE }}
9 changes: 5 additions & 4 deletions .github/workflows/sphinx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@ name: Sphinx

on:
pull_request:
push:

jobs:
linkcheck:
name: Link Check
runs-on: ubuntu-latest
steps:
- name: Clone repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: '3.7'
- name: Install Python dependencies
Expand All @@ -26,11 +27,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Clone repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Set up Graphviz
run: sudo apt update && sudo apt install -y graphviz
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: '3.7'
- name: Install Python dependencies
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
# Generated during a regular build
build
source/locale/pot/.doctrees
/source/locale/en_US
11 changes: 8 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,15 @@ repos:
- id: scour
name: "Optimize SVG files"
files: ^.*\.svg$
entry: tools/optimize_svg.py
entry: python tools/optimize_svg.py
language: python
additional_dependencies:
- scour==0.38.2
- id: gh-wiki-anchors
name: "Fix GitHub Wiki Anchors for Linkcheck"
types: [rst]
entry: python tools/fixup_gh_wiki_anchors.py
language: python
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.1.0
hooks:
Expand All @@ -28,11 +33,11 @@ repos:
args: ["--ignore-words", ".codespellignore"]
exclude: ^(.*\.svg|source/locale/.*)$
- repo: https://github.com/psf/black
rev: 20.8b1
rev: 22.3.0
hooks:
- id: black
name: "Reformat Python code"
- repo: https://gitlab.com/pycqa/flake8
- repo: https://github.com/pycqa/flake8
rev: '3.8.3'
hooks:
- id: flake8
Expand Down
Loading

0 comments on commit 477902c

Please sign in to comment.