Skip to content

Commit 8b33b8d

Browse files
authored
Merge pull request #10 from useblocks/update-CI-nodes
🔧use github-hosted runners
2 parents f6405fe + e7e60ba commit 8b33b8d

3 files changed

Lines changed: 12 additions & 36 deletions

File tree

.github/actions/setup_rye/action.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,6 @@ name: Set up rye
22
runs:
33
using: 'composite'
44
steps:
5-
# rye uses uv under the hood, so we need to set the cache directory correctly, based on the OS
6-
- name: Set UV_CACHE_DIR for Linux
7-
if: runner.os == 'Linux'
8-
run: |
9-
echo "UV_CACHE_DIR=/home/runner/.cache/uv" >> $GITHUB_ENV
10-
shell: bash
11-
- name: Set MATURIN_PEP517_ARGS for Linux
12-
if: runner.os == 'Linux'
13-
# make sure we always use zig, to get manylinux2014 compatible rust binaries
14-
run: |
15-
echo "MATURIN_PEP517_ARGS=--zig" >> $GITHUB_ENV
16-
shell: bash
17-
- name: Set UV_CACHE_DIR for MacOS
18-
if: runner.os == 'macOS'
19-
run: echo "UV_CACHE_DIR=/Users/gh-runner/Library/Caches/uv" >> $GITHUB_ENV
20-
shell: bash
21-
- name: Set UV_CACHE_DIR for Windows
22-
if: runner.os == 'Windows'
23-
run: echo "UV_CACHE_DIR=C:\\Users\\useblocks\\AppData\\Local\\uv-${{ runner.name }}" >> $env:GITHUB_ENV
24-
shell: pwsh
255
# now install rye and sync the dependencies
266
- uses: eifinger/setup-rye@v4
277
with:

.github/workflows/ci.yml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ permissions:
2121
jobs:
2222
pre-commit:
2323
name: Pre-commit
24-
runs-on: [self-hosted, linux, x64]
24+
runs-on: ubuntu-latest
2525
steps:
2626
- uses: actions/checkout@v4
2727
- uses: actions/setup-python@v5
@@ -33,29 +33,25 @@ jobs:
3333

3434
mypy:
3535
name: MyPy
36-
runs-on: [self-hosted, linux, x64]
36+
runs-on: ubuntu-latest
3737

3838
steps:
3939
- uses: actions/checkout@v4
4040
- uses: ./.github/actions/setup_rye
4141
- run: rye run mypy:all
4242

4343
pytest:
44-
name: Pytest (${{ matrix.os }}-${{ matrix.arch }})
44+
name: Pytest (${{ matrix.os }})
4545
strategy:
4646
fail-fast: false
4747
matrix:
4848
include:
49-
- os: linux
50-
arch: x64
51-
- os: linux
52-
arch: arm64
53-
- os: windows
54-
arch: x64
55-
- os: macos
56-
arch: arm64
49+
- os: ubuntu-latest
50+
- os: ubuntu-24.04-arm
51+
- os: windows-latest
52+
- os: macos-latest
5753

58-
runs-on: [self-hosted, "${{ matrix.os }}", "${{ matrix.arch }}"]
54+
runs-on: ["${{ matrix.os }}"]
5955

6056
steps:
6157
- uses: actions/checkout@v4
@@ -64,7 +60,7 @@ jobs:
6460

6561
docs:
6662
name: Documentation build
67-
runs-on: [self-hosted, linux, x64]
63+
runs-on: ubuntu-latest
6864

6965
steps:
7066
- uses: actions/checkout@v4
@@ -84,7 +80,7 @@ jobs:
8480
- pytest
8581
- docs
8682

87-
runs-on: [self-hosted, linux, x64]
83+
runs-on: ubuntu-latest
8884

8985
steps:
9086
- name: Decide whether the needed jobs succeeded or failed

.github/workflows/gh_pages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ concurrency:
2525
jobs:
2626
build:
2727
name: Build
28-
runs-on: [self-hosted, linux, x64]
28+
runs-on: ubuntu-latest
2929
steps:
3030
- uses: actions/checkout@v4
3131
- name: Setup Pages
@@ -45,7 +45,7 @@ jobs:
4545
name: github-pages
4646
url: ${{ steps.deployment.outputs.page_url }}
4747
needs: build
48-
runs-on: [self-hosted, linux, x64]
48+
runs-on: ubuntu-latest
4949
name: Deploy
5050
steps:
5151
- name: Deploy to GitHub Pages

0 commit comments

Comments
 (0)