Skip to content

Commit c0cfde9

Browse files
committed
Test github hosted runners
1 parent 6e0ec24 commit c0cfde9

File tree

3 files changed

+13
-20
lines changed

3 files changed

+13
-20
lines changed

.github/workflows/build-cross-action.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ jobs:
3737
( matrix.host != matrix.target && inputs.kind == "cross" )
3838
3939
runs-on:
40-
- self-hosted
41-
- linux
42-
- src-build
43-
- ${{ matrix.host }}
40+
- ${{ (contains(matrix.host, "x86_64") && "linux-x86_64") || "linux-arm64" }}
4441

4542
env:
4643
RELENV_DATA: ${{ github.workspace }}
@@ -56,8 +53,9 @@ jobs:
5653
- name: Install Dependencies
5754
run: |
5855
sudo apt-get update
59-
sudo apt-get install -y build-essential bison python3-all patchelf swig
60-
python3 -m pip install nox
56+
sudo apt-get install -y build-essential bison python3-all patchelf swig python3-virtualenv
57+
virtualenv venv
58+
venv/bin/pip3 install nox
6159
6260
- name: Python Version
6361
run: |

.github/workflows/build-native-action.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,7 @@ jobs:
3232
name: "Python ${{ matrix.version }} Linux ${{ matrix.target }} on ${{ matrix.host }}"
3333

3434
runs-on:
35-
- self-hosted
36-
- linux
37-
- src-build
38-
- ${{ matrix.host }}
35+
- ${{ (contains(matrix.host, 'x86_64') && 'linux-x86_64') || 'linux-arm64' }}
3936

4037
env:
4138
RELENV_DATA: ${{ github.workspace }}
@@ -46,13 +43,14 @@ jobs:
4643
- name: Install Dependencies
4744
run: |
4845
sudo apt-get update
49-
sudo apt-get install -y build-essential bison python3-all patchelf swig cmake libldap2-dev libsasl2-dev ldap-utils libssl-dev pkg-config libvirt-dev default-libmysqlclient-dev
50-
python3 -m pip install nox
46+
sudo apt-get install -y build-essential bison python3-all patchelf swig cmake libldap2-dev libsasl2-dev ldap-utils libssl-dev pkg-config libvirt-dev default-libmysqlclient-dev python3-virtualenv
47+
virtualenv venv
48+
venv/bin/pip3 install nox
5149
5250
- name: Python Version
5351
run: |
54-
python3 --version
55-
python3 -c 'import os; print(os.name)'
52+
venv/bin/python3 --version
53+
venv/bin/python3 -c 'import os; print(os.name)'
5654
5755
- name: Download Toolchain Artifact
5856
uses: actions/download-artifact@v4
@@ -67,12 +65,12 @@ jobs:
6765
6866
- name: Build
6967
run: |
70-
python3 -m relenv build --arch=${{ matrix.target }} --python=${{ matrix.version }}
68+
venv/bin/python3 -m relenv build --arch=${{ matrix.target }} --python=${{ matrix.version }}
7169
7270
- name: Verify Build
7371
if: ${{ matrix.host == matrix.target }}
7472
run: |
75-
python3 -m nox -e tests -- -s tests/test_verify_build.py
73+
venv/bin/python3 -m nox -e tests -- -s tests/test_verify_build.py
7674
7775
- name: Linux Logs
7876
uses: actions/upload-artifact@v4

.github/workflows/toolchain-action.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ jobs:
1515
name: "Toolchain ${{ matrix.target }} on ${{ matrix.host }}"
1616

1717
runs-on:
18-
- self-hosted
19-
- linux
20-
- src-build
21-
- ${{ matrix.host }}
18+
- ${{ (contains(matrix.host, 'x86_64') && 'linux-x86_64') || 'linux-arm64' }}
2219

2320
#if: fromJSON(inputs.changed-files)['toolchain'] == 'true'
2421

0 commit comments

Comments
 (0)