Skip to content

Commit 0871431

Browse files
committed
Merge remote-tracking branch 'upstream/3.13' into library/math
2 parents 469eaaa + bccef33 commit 0871431

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+9488
-9064
lines changed

Diff for: .github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ on:
55

66
jobs:
77
ci:
8-
runs-on: ubuntu-latest
8+
runs-on: ubuntu-22.04
99
steps:
1010
- uses: actions/checkout@v4
1111

1212
- name: Install Dependencies
1313
run: sudo apt-get install gettext
1414

1515
- name: Validate
16-
run: VERSION=${{ github.event.repository.default_branch }} MODE=dummy make all
16+
run: VERSION=${{ github.event.repository.default_branch }} JOBS=4 MODE=html make all

Diff for: .github/workflows/deploy-gh-page.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
run: sudo apt-get install gettext
1616

1717
- name: Build
18-
run: make all
18+
run: JOBS=4 MODE=html make all
1919

2020
- name: Deploy to gh page
21-
uses: JamesIves/[email protected].4
21+
uses: JamesIves/[email protected].8
2222
with:
2323
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2424
BRANCH: gh-pages

Diff for: .scripts/poetry.lock

+131-97
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ SPHINX_CONF := $(CPYTHON_CLONE)/Doc/conf.py
4343
LANGUAGE := zh_TW
4444
LC_MESSAGES := $(CPYTHON_CLONE)/Doc/locales/$(LANGUAGE)/LC_MESSAGES
4545
VENV := ~/.venvs/python-docs-i18n/
46-
MODE := autobuild-dev-html
47-
JOBS := 4
46+
MODE := $(or $(MODE), autobuild-dev-html)
47+
JOBS := $(or $(JOBS), auto)
4848

4949
.PHONY: all
5050
all: prepare_deps ## Automatically build an html local version

0 commit comments

Comments
 (0)