Skip to content

Commit 8a321fd

Browse files
committed
feat: refactor CI workflows and add config file
1 parent 22fdaea commit 8a321fd

File tree

5 files changed

+238
-150
lines changed

5 files changed

+238
-150
lines changed

.github/config.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"targets": [
3+
"aarch64-unknown-none-softfloat",
4+
"x86_64-unknown-linux-gnu",
5+
"x86_64-unknown-none",
6+
"riscv64gc-unknown-none-elf"
7+
],
8+
"rust_components": [
9+
"rust-src",
10+
"clippy",
11+
"rustfmt"
12+
]
13+
}

.github/workflows/check.yml

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,42 @@
11
name: Quality Checks
22

33
on:
4+
push:
5+
branches:
6+
- '**'
7+
tags-ignore:
8+
- '**'
9+
pull_request:
410
workflow_call:
511

612
jobs:
13+
load-config:
14+
name: Load CI Configuration
15+
runs-on: ubuntu-latest
16+
outputs:
17+
targets: ${{ steps.config.outputs.targets }}
18+
rust_components: ${{ steps.config.outputs.rust_components }}
19+
steps:
20+
- name: Checkout code
21+
uses: actions/checkout@v4
22+
23+
- name: Load configuration
24+
id: config
25+
run: |
26+
TARGETS=$(jq -c '.targets' .github/config.json)
27+
COMPONENTS=$(jq -r '.rust_components | join(", ")' .github/config.json)
28+
29+
echo "targets=$TARGETS" >> $GITHUB_OUTPUT
30+
echo "rust_components=$COMPONENTS" >> $GITHUB_OUTPUT
31+
732
check:
8-
name: Quality Checks
33+
name: Check
934
runs-on: ubuntu-latest
35+
needs: load-config
1036
strategy:
1137
fail-fast: false
1238
matrix:
13-
target:
14-
- x86_64-unknown-linux-gnu
15-
- x86_64-unknown-none
16-
- riscv64gc-unknown-none-elf
17-
- aarch64-unknown-none-softfloat
39+
target: ${{ fromJson(needs.load-config.outputs.targets) }}
1840

1941
steps:
2042
- name: Checkout code
@@ -23,8 +45,7 @@ jobs:
2345
- name: Install Rust toolchain
2446
uses: dtolnay/rust-toolchain@nightly
2547
with:
26-
toolchain: nightly-2025-05-20
27-
components: rust-src, clippy, rustfmt
48+
components: ${{ needs.load-config.outputs.rust_components }}
2849
targets: ${{ matrix.target }}
2950

3051
- name: Check rust version
@@ -37,7 +58,7 @@ jobs:
3758
run: cargo build --target ${{ matrix.target }} --all-features
3859

3960
- name: Run clippy
40-
run: cargo clippy --target ${{ matrix.target }} --all-features -- -D warnings -A clippy::new_without_default
61+
run: cargo clippy --target ${{ matrix.target }} --all-features -- -D warnings
4162

4263
- name: Build documentation
4364
env:

.github/workflows/deploy.yml

Lines changed: 56 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@ name: Deploy
22

33
on:
44
push:
5-
branches:
6-
- '**'
7-
tags-ignore:
8-
- 'v*'
9-
- 'v*-pre.*'
10-
pull_request:
5+
tags:
6+
- 'v[0-9]+.[0-9]+.[0-9]+'
117

128
permissions:
139
contents: read
@@ -23,45 +19,90 @@ env:
2319
RUST_BACKTRACE: 1
2420

2521
jobs:
26-
quality-check:
22+
verify-tag:
23+
name: Verify Tag
24+
runs-on: ubuntu-latest
25+
outputs:
26+
should_deploy: ${{ steps.check.outputs.should_deploy }}
27+
steps:
28+
- name: Checkout code
29+
uses: actions/checkout@v4
30+
with:
31+
fetch-depth: 0
32+
33+
- name: Check if tag is on main or master branch
34+
id: check
35+
run: |
36+
git fetch origin main master || true
37+
BRANCHES=$(git branch -r --contains ${{ github.ref }})
38+
39+
if echo "$BRANCHES" | grep -qE 'origin/(main|master)'; then
40+
echo "✓ Tag is on main or master branch"
41+
echo "should_deploy=true" >> $GITHUB_OUTPUT
42+
else
43+
echo "✗ Tag is not on main or master branch, skipping deployment"
44+
echo "Tag is on: $BRANCHES"
45+
echo "should_deploy=false" >> $GITHUB_OUTPUT
46+
fi
47+
48+
- name: Verify version consistency
49+
if: steps.check.outputs.should_deploy == 'true'
50+
run: |
51+
# Extract version from git tag (remove 'v' prefix)
52+
TAG_VERSION="${{ github.ref_name }}"
53+
TAG_VERSION="${TAG_VERSION#v}"
54+
# Extract version from Cargo.toml
55+
CARGO_VERSION=$(grep -m1 '^version' Cargo.toml | sed 's/.*"\(.*\)"/\1/')
56+
echo "Git tag version: $TAG_VERSION"
57+
echo "Cargo.toml version: $CARGO_VERSION"
58+
if [ "$TAG_VERSION" != "$CARGO_VERSION" ]; then
59+
echo "ERROR: Version mismatch! Tag version ($TAG_VERSION) != Cargo.toml version ($CARGO_VERSION)"
60+
exit 1
61+
fi
62+
echo "✓ Version check passed!"
63+
64+
check:
2765
uses: ./.github/workflows/check.yml
66+
needs: verify-tag
67+
if: needs.verify-tag.outputs.should_deploy == 'true'
2868

2969
test:
3070
uses: ./.github/workflows/test.yml
71+
needs: verify-tag
72+
if: needs.verify-tag.outputs.should_deploy == 'true'
3173

32-
build-doc:
74+
build:
3375
name: Build documentation
3476
runs-on: ubuntu-latest
35-
needs: quality-check
77+
needs: [verify-tag, check, test]
78+
if: needs.verify-tag.outputs.should_deploy == 'true'
3679
steps:
3780
- name: Checkout code
3881
uses: actions/checkout@v4
3982

4083
- name: Install Rust toolchain
4184
uses: dtolnay/rust-toolchain@nightly
42-
with:
43-
toolchain: nightly-2025-05-20
4485

4586
- name: Build docs
4687
env:
4788
RUSTDOCFLAGS: -D rustdoc::broken_intra_doc_links -D missing-docs
4889
run: |
4990
cargo doc --no-deps --all-features
50-
printf '<meta http-equiv="refresh" content="0;url=axvisor_api/index.html">' > target/doc/index.html
91+
printf '<meta http-equiv="refresh" content="0;url=%s/index.html">' $(cargo tree | head -1 | cut -d' ' -f1) > target/doc/index.html
5192
5293
- name: Upload artifact
5394
uses: actions/upload-pages-artifact@v3
5495
with:
5596
path: target/doc
5697

57-
deploy-doc:
98+
deploy:
5899
name: Deploy to GitHub Pages
59100
environment:
60101
name: github-pages
61102
url: ${{ steps.deployment.outputs.page_url }}
62103
runs-on: ubuntu-latest
63-
needs: build-doc
64-
if: github.ref == format('refs/heads/{0}', github.event.repository.default_branch)
104+
needs: [verify-tag, build]
105+
if: needs.verify-tag.outputs.should_deploy == 'true'
65106
steps:
66107
- name: Deploy to GitHub Pages
67108
id: deployment

0 commit comments

Comments
 (0)