Skip to content

Commit 0436e7a

Browse files
authored
Merge branch 'ArchipelagoMW:main' into newmain
2 parents 4f116df + b7621a0 commit 0436e7a

483 files changed

Lines changed: 33772 additions & 8048 deletions

File tree

Some content is hidden

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

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
worlds/blasphemous/region_data.py linguist-generated=true
2+
worlds/yachtdice/YachtWeights.py linguist-generated=true

.github/pyright-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"reportMissingImports": true,
1717
"reportMissingTypeStubs": true,
1818

19-
"pythonVersion": "3.8",
19+
"pythonVersion": "3.10",
2020
"pythonPlatform": "Windows",
2121

2222
"executionEnvironments": [

.github/workflows/analyze-modified-files.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- uses: actions/setup-python@v5
5454
if: env.diff != ''
5555
with:
56-
python-version: 3.8
56+
python-version: '3.10'
5757

5858
- name: "Install dependencies"
5959
if: env.diff != ''

.github/workflows/build.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@ env:
2424
jobs:
2525
# build-release-macos: # LF volunteer
2626

27-
build-win-py38: # RCs will still be built and signed by hand
27+
build-win: # RCs will still be built and signed by hand
2828
runs-on: windows-latest
2929
steps:
3030
- uses: actions/checkout@v4
3131
- name: Install python
3232
uses: actions/setup-python@v5
3333
with:
34-
python-version: '3.8'
34+
python-version: '~3.12.7'
35+
check-latest: true
3536
- name: Download run-time dependencies
3637
run: |
3738
Invoke-WebRequest -Uri https://github.com/Ijwu/Enemizer/releases/download/${Env:ENEMIZER_VERSION}/win-x64.zip -OutFile enemizer.zip
@@ -111,10 +112,11 @@ jobs:
111112
- name: Get a recent python
112113
uses: actions/setup-python@v5
113114
with:
114-
python-version: '3.11'
115+
python-version: '~3.12.7'
116+
check-latest: true
115117
- name: Install build-time dependencies
116118
run: |
117-
echo "PYTHON=python3.11" >> $GITHUB_ENV
119+
echo "PYTHON=python3.12" >> $GITHUB_ENV
118120
wget -nv https://github.com/AppImage/AppImageKit/releases/download/$APPIMAGETOOL_VERSION/appimagetool-x86_64.AppImage
119121
chmod a+rx appimagetool-x86_64.AppImage
120122
./appimagetool-x86_64.AppImage --appimage-extract

.github/workflows/release.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,11 @@ jobs:
4444
- name: Get a recent python
4545
uses: actions/setup-python@v5
4646
with:
47-
python-version: '3.11'
47+
python-version: '~3.12.7'
48+
check-latest: true
4849
- name: Install build-time dependencies
4950
run: |
50-
echo "PYTHON=python3.11" >> $GITHUB_ENV
51+
echo "PYTHON=python3.12" >> $GITHUB_ENV
5152
wget -nv https://github.com/AppImage/AppImageKit/releases/download/$APPIMAGETOOL_VERSION/appimagetool-x86_64.AppImage
5253
chmod a+rx appimagetool-x86_64.AppImage
5354
./appimagetool-x86_64.AppImage --appimage-extract

.github/workflows/scan-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ jobs:
4040
run: |
4141
wget https://apt.llvm.org/llvm.sh
4242
chmod +x ./llvm.sh
43-
sudo ./llvm.sh 17
43+
sudo ./llvm.sh 19
4444
- name: Install scan-build command
4545
run: |
46-
sudo apt install clang-tools-17
46+
sudo apt install clang-tools-19
4747
- name: Get a recent python
4848
uses: actions/setup-python@v5
4949
with:
@@ -56,7 +56,7 @@ jobs:
5656
- name: scan-build
5757
run: |
5858
source venv/bin/activate
59-
scan-build-17 --status-bugs -o scan-build-reports -disable-checker deadcode.DeadStores python setup.py build -y
59+
scan-build-19 --status-bugs -o scan-build-reports -disable-checker deadcode.DeadStores python setup.py build -y
6060
- name: Store report
6161
if: failure()
6262
uses: actions/upload-artifact@v4

.github/workflows/unittests.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,11 @@ jobs:
3333
matrix:
3434
os: [ubuntu-latest]
3535
python:
36-
- {version: '3.8'}
37-
- {version: '3.9'}
3836
- {version: '3.10'}
3937
- {version: '3.11'}
4038
- {version: '3.12'}
4139
include:
42-
- python: {version: '3.8'} # win7 compat
40+
- python: {version: '3.10'} # old compat
4341
os: windows-latest
4442
- python: {version: '3.12'} # current
4543
os: windows-latest

0 commit comments

Comments
 (0)