Skip to content

Commit a43e443

Browse files
Update workflow (#52)
* Update and simplify the workflows * Ignore new leveldb and install directory
1 parent 47c490e commit a43e443

File tree

3 files changed

+29
-55
lines changed

3 files changed

+29
-55
lines changed

.github/workflows/python-build.yml

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,39 +12,26 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
cfg:
16-
- { os: windows-latest, architecture: x64, python-version: "3.8" }
17-
- { os: windows-latest, architecture: x86, python-version: "3.8" }
18-
- { os: macos-13, architecture: x64, python-version: "3.8" }
19-
- { os: macos-latest, architecture: arm64, python-version: "3.8" }
20-
- { os: windows-latest, architecture: x64, python-version: "3.9" }
21-
- { os: windows-latest, architecture: x86, python-version: "3.9" }
22-
- { os: macos-13, architecture: x64, python-version: "3.9" }
23-
- { os: macos-latest, architecture: arm64, python-version: "3.9" }
24-
- { os: windows-latest, architecture: x64, python-version: "3.10" }
25-
- { os: windows-latest, architecture: x86, python-version: "3.10" }
26-
- { os: macos-13, architecture: x64, python-version: "3.10" }
27-
- { os: macos-latest, architecture: arm64, python-version: "3.10" }
28-
- { os: windows-latest, architecture: x64, python-version: "3.11" }
29-
- { os: windows-latest, architecture: x86, python-version: "3.11" }
30-
- { os: macos-13, architecture: x64, python-version: "3.11" }
31-
- { os: macos-latest, architecture: arm64, python-version: "3.11" }
32-
- { os: windows-latest, architecture: x64, python-version: "3.12" }
33-
- { os: windows-latest, architecture: x86, python-version: "3.12" }
34-
- { os: macos-13, architecture: x64, python-version: "3.12" }
35-
- { os: macos-latest, architecture: arm64, python-version: "3.12" }
15+
os: [
16+
windows-2025,
17+
macos-15
18+
]
19+
python-version: [
20+
"3.10",
21+
"3.11",
22+
"3.12"
23+
]
3624

37-
runs-on: ${{ matrix.cfg.os }}
25+
runs-on: ${{ matrix.os }}
3826

3927
steps:
4028
- uses: actions/checkout@v4
4129
with:
4230
submodules: 'recursive'
43-
- name: Set up Python ${{ matrix.cfg.python-version }} ${{ matrix.cfg.architecture }}
31+
- name: Set up Python ${{ matrix.python-version }}
4432
uses: actions/setup-python@v5
4533
with:
46-
python-version: ${{ matrix.cfg.python-version }}
47-
architecture: ${{ matrix.cfg.architecture }}
34+
python-version: ${{ matrix.python-version }}
4835
- name: Install dependencies
4936
run: |
5037
python -m pip install --upgrade pip

.github/workflows/python-unittests.yml

Lines changed: 13 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,44 +17,27 @@ jobs:
1717
continue-on-error: true
1818
strategy:
1919
matrix:
20-
cfg:
21-
- { os: windows-latest, architecture: x64, python-version: "3.8" }
22-
- { os: windows-latest, architecture: x86, python-version: "3.8" }
23-
- { os: macos-13, architecture: x64, python-version: "3.8" }
24-
- { os: macos-latest, architecture: arm64, python-version: "3.8" }
25-
- { os: ubuntu-latest, architecture: x64, python-version: "3.8" }
26-
- { os: windows-latest, architecture: x64, python-version: "3.9" }
27-
- { os: windows-latest, architecture: x86, python-version: "3.9" }
28-
- { os: macos-13, architecture: x64, python-version: "3.9" }
29-
- { os: macos-latest, architecture: arm64, python-version: "3.9" }
30-
- { os: ubuntu-latest, architecture: x64, python-version: "3.9" }
31-
- { os: windows-latest, architecture: x64, python-version: "3.10" }
32-
- { os: windows-latest, architecture: x86, python-version: "3.10" }
33-
- { os: macos-13, architecture: x64, python-version: "3.10" }
34-
- { os: macos-latest, architecture: arm64, python-version: "3.10" }
35-
- { os: ubuntu-latest, architecture: x64, python-version: "3.10" }
36-
- { os: windows-latest, architecture: x64, python-version: "3.11" }
37-
- { os: windows-latest, architecture: x86, python-version: "3.11" }
38-
- { os: macos-13, architecture: x64, python-version: "3.11" }
39-
- { os: macos-latest, architecture: arm64, python-version: "3.11" }
40-
- { os: ubuntu-latest, architecture: x64, python-version: "3.11" }
41-
- { os: windows-latest, architecture: x64, python-version: "3.12" }
42-
- { os: windows-latest, architecture: x86, python-version: "3.12" }
43-
- { os: macos-13, architecture: x64, python-version: "3.12" }
44-
- { os: macos-latest, architecture: arm64, python-version: "3.12" }
45-
- { os: ubuntu-latest, architecture: x64, python-version: "3.12" }
20+
os: [
21+
windows-2025,
22+
macos-15,
23+
ubuntu-22.04
24+
]
25+
python-version: [
26+
"3.10",
27+
"3.11",
28+
"3.12"
29+
]
4630

47-
runs-on: ${{ matrix.cfg.os }}
31+
runs-on: ${{ matrix.os }}
4832

4933
steps:
5034
- uses: actions/checkout@v4
5135
with:
5236
submodules: 'recursive'
53-
- name: Set up Python ${{ matrix.cfg.python-version }} ${{ matrix.cfg.architecture }}
37+
- name: Set up Python ${{ matrix.python-version }}
5438
uses: actions/setup-python@v5
5539
with:
56-
python-version: ${{ matrix.cfg.python-version }}
57-
architecture: ${{ matrix.cfg.architecture }}
40+
python-version: ${{ matrix.python-version }}
5841
- name: Install dependencies
5942
run: |
6043
python -m pip install --upgrade pip

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,3 +145,7 @@ cython_debug/
145145
.idea/
146146

147147
/src/leveldb/*.cpp
148+
149+
# New Amulet
150+
/src/amulet/*
151+
/install

0 commit comments

Comments
 (0)