Skip to content

Commit dfd59f5

Browse files
committed
Merge ../skeleton into test/common
2 parents 7a04492 + a331924 commit dfd59f5

File tree

2 files changed

+36
-43
lines changed

2 files changed

+36
-43
lines changed

.github/workflows/common.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: "Common Steps"
2+
runs:
3+
using: "composite"
4+
steps:
5+
- uses: actions/checkout@v4
6+
with:
7+
fetch-depth: ${{ env.FETCH_DEPTH }}
8+
- name: Install build dependencies
9+
# Install dependencies for building packages on pre-release Pythons
10+
# jaraco/skeleton#161
11+
if: matrix.python == '3.14' && matrix.platform == 'ubuntu-latest'
12+
run: |
13+
sudo apt update
14+
sudo apt install -y libxml2-dev libxslt-dev
15+
- name: Setup Python
16+
uses: actions/setup-python@v4
17+
with:
18+
python-version: ${{ matrix.python }}
19+
allow-prereleases: true
20+
- name: Install tox
21+
run: python -m pip install tox
22+
- name: Run
23+
run: tox

.github/workflows/main.yml

Lines changed: 13 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -55,30 +55,8 @@ jobs:
5555
runs-on: ${{ matrix.platform }}
5656
continue-on-error: ${{ matrix.python == '3.14' }}
5757
steps:
58-
- uses: actions/checkout@v4
59-
- name: Install build dependencies
60-
# Install dependencies for building packages on pre-release Pythons
61-
# jaraco/skeleton#161
62-
if: matrix.python == '3.14' && matrix.platform == 'ubuntu-latest'
63-
run: |
64-
sudo apt update
65-
sudo apt install -y libxml2-dev libxslt-dev
66-
- name: Enable unprivileged ping sockets
67-
# actions/runner-images#11614
68-
if: matrix.platform == 'ubuntu-latest'
69-
shell: bash
70-
run: |
71-
echo 'net.ipv4.ping_group_range = 0 2147483647' | sudo tee -a /etc/sysctl.conf
72-
sudo sysctl -p
73-
- name: Setup Python
74-
uses: actions/setup-python@v4
75-
with:
76-
python-version: ${{ matrix.python }}
77-
allow-prereleases: true
78-
- name: Install tox
79-
run: python -m pip install tox
80-
- name: Run
81-
run: tox
58+
- name: Common Prep
59+
uses: ./.github/workflows/common.yml
8260

8361
collateral:
8462
strategy:
@@ -87,26 +65,18 @@ jobs:
8765
job:
8866
- diffcov
8967
- docs
90-
runs-on: ubuntu-latest
68+
python:
69+
- "3.x"
70+
platform:
71+
- ubuntu-latest
72+
env:
73+
FETCH_DEPTH: 0
74+
TOX_ENV: ${{ matrix.job }}
75+
runs-on: ${{ matrix.platform }}
76+
continue-on-error: ${{ matrix.python == '3.14' }}
9177
steps:
92-
- uses: actions/checkout@v4
93-
with:
94-
fetch-depth: 0
95-
- name: Enable unprivileged ping sockets
96-
# actions/runner-images#11614
97-
if: matrix.platform == 'ubuntu-latest'
98-
shell: bash
99-
run: |
100-
echo 'net.ipv4.ping_group_range = 0 2147483647' | sudo tee -a /etc/sysctl.conf
101-
sudo sysctl -p
102-
- name: Setup Python
103-
uses: actions/setup-python@v4
104-
with:
105-
python-version: 3.x
106-
- name: Install tox
107-
run: python -m pip install tox
108-
- name: Eval ${{ matrix.job }}
109-
run: tox -e ${{ matrix.job }}
78+
- name: Common Prep
79+
uses: ./.github/workflows/common.yml
11080

11181
check: # This job does nothing and is only used for the branch protection
11282
if: always()

0 commit comments

Comments
 (0)