Commit0871431

committed

Merge remote-tracking branch 'upstream/3.13' into library/math

2 parents469eaaa +bccef33 commit0871431Copy full SHA for 0871431

File tree

+9488

-9064

lines changed

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

+9488

-9064

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,12 @@ on:`
`5`	`5`
`6`	`6`	`jobs:`
`7`	`7`	`ci:`
`8`		`-runs-on:ubuntu-latest`
	`8`	`+runs-on:ubuntu-22.04`
`9`	`9`	`steps:`
`10`	`10`	`-uses:actions/checkout@v4`
`11`	`11`
`12`	`12`	`-name:Install Dependencies`
`13`	`13`	`run:sudo apt-get install gettext`
`14`	`14`
`15`	`15`	`-name:Validate`
`16`		`-run:VERSION=${{ github.event.repository.default_branch }} MODE=dummy make all`
	`16`	`+run:VERSION=${{ github.event.repository.default_branch }}JOBS=4MODE=html make all`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,10 @@ jobs:`
`15`	`15`	`run:sudo apt-get install gettext`
`16`	`16`
`17`	`17`	`-name:Build`
`18`		`-run:make all`
	`18`	`+run:JOBS=4 MODE=htmlmake all`
`19`	`19`
`20`	`20`	`-name:Deploy to gh page`
`21`		`-uses:JamesIves/github-pages-deploy-action@v4.6.4`
	`21`	`+uses:JamesIves/github-pages-deploy-action@v4.6.8`
`22`	`22`	`with:`
`23`	`23`	`GITHUB_TOKEN:${{ secrets.GITHUB_TOKEN }}`
`24`	`24`	`BRANCH:gh-pages`

Lines changed: 131 additions & 97 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@ SPHINX_CONF := $(CPYTHON_CLONE)/Doc/conf.py`
`43`	`43`	`LANGUAGE := zh_TW`
`44`	`44`	`LC_MESSAGES :=$(CPYTHON_CLONE)/Doc/locales/$(LANGUAGE)/LC_MESSAGES`
`45`	`45`	`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)`
`48`	`48`
`49`	`49`	`.PHONY: all`
`50`	`50`	`all: prepare_deps## Automatically build an html local version`

Comments

(0)