Skip to content

Commit 299dc56

Browse files
committed
ci: Delete ARM target
1 parent d435d18 commit 299dc56

3 files changed

Lines changed: 61 additions & 12 deletions

File tree

.github/workflows/ci.yml

Lines changed: 48 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@ permissions:
2121
pull-requests: write
2222

2323
jobs:
24+
commitlint:
25+
runs-on: ubuntu-latest
26+
if: github.ref != 'refs/heads/main'
27+
steps:
28+
- uses: actions/checkout@v6
29+
with:
30+
fetch-depth: 0
31+
32+
- uses: wagoid/commitlint-github-action@v6
33+
2434
linters:
2535
runs-on: ubuntu-latest
2636
timeout-minutes: 5
@@ -43,6 +53,9 @@ jobs:
4353
tests-redis:
4454
runs-on: ubuntu-latest
4555
timeout-minutes: 10
56+
strategy:
57+
matrix:
58+
redis-version: ["7.x", "8.x"]
4659
steps:
4760
- uses: actions/checkout@v6
4861

@@ -62,7 +75,7 @@ jobs:
6275
- name: Start Redis with SHIELD module
6376
uses: shogo82148/actions-setup-redis@v1
6477
with:
65-
redis-version: "8.x"
78+
redis-version: ${{ matrix.redis-version }}
6679
redis-port: "34567"
6780
redis-conf: |
6881
loadmodule ${{ github.workspace }}/target/debug/libredis_shield.so
@@ -73,6 +86,9 @@ jobs:
7386
tests-valkey:
7487
runs-on: ubuntu-latest
7588
timeout-minutes: 10
89+
strategy:
90+
matrix:
91+
redis-version: ["7.x", "8.x"]
7692
steps:
7793
- uses: actions/checkout@v6
7894

@@ -93,20 +109,45 @@ jobs:
93109
uses: shogo82148/actions-setup-redis@v1
94110
with:
95111
distribution: valkey
96-
redis-version: "8.x"
112+
redis-version: ${{ matrix.redis-version }}
97113
redis-port: "34567"
98114
redis-conf: |
99115
loadmodule ${{ github.workspace }}/target/debug/libredis_shield.so
100116
101117
- name: Run tests
102118
run: just test
103119

104-
commitlint:
105-
runs-on: ubuntu-latest
106-
if: github.ref != 'refs/heads/main'
120+
build-test:
121+
needs: [tests-redis, tests-valkey]
122+
timeout-minutes: 10
123+
strategy:
124+
fail-fast: false
125+
matrix:
126+
include:
127+
- target: x86_64-unknown-linux-gnu
128+
os: ubuntu-latest
129+
- target: x86_64-apple-darwin
130+
os: macos-latest
131+
- target: aarch64-apple-darwin
132+
os: macos-latest
133+
- target: aarch64-unknown-linux-gnu
134+
os: ubuntu-latest
135+
cross: true
136+
runs-on: ${{ matrix.os }}
107137
steps:
108138
- uses: actions/checkout@v6
139+
140+
- name: Setup cross-compilation toolchain
141+
if: matrix.cross
142+
uses: taiki-e/setup-cross-toolchain-action@v1
109143
with:
110-
fetch-depth: 0
144+
target: ${{ matrix.target }}
111145

112-
- uses: wagoid/commitlint-github-action@v6
146+
- name: Install rust toolchain
147+
uses: actions-rust-lang/setup-rust-toolchain@v1
148+
with:
149+
cache-key: ${{ runner.os }}-${{ matrix.target }}-cargo-${{ hashFiles('rust-toolchain.toml') }}-${{ hashFiles('Cargo.lock') }}
150+
target: ${{ matrix.target }}
151+
152+
- name: Build library
153+
run: cargo build --target ${{ matrix.target }}

.github/workflows/release.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: taiki-e/create-gh-release-action@v1
1717
with:
1818
changelog: CHANGELOG.md
19-
token: ${{ secrets.GITHUB_TOKEN }}
19+
token: ${{ secrets.RELEASE_TOKEN }}
2020

2121
upload-assets:
2222
needs: create-release
@@ -26,24 +26,31 @@ jobs:
2626
include:
2727
- target: x86_64-unknown-linux-gnu
2828
os: ubuntu-latest
29-
- target: aarch64-unknown-linux-gnu
30-
os: ubuntu-24.04-arm
3129
- target: x86_64-apple-darwin
3230
os: macos-latest
3331
- target: aarch64-apple-darwin
3432
os: macos-latest
33+
- target: aarch64-unknown-linux-gnu
34+
os: ubuntu-latest
35+
cross: true
3536
runs-on: ${{ matrix.os }}
3637
steps:
3738
- uses: actions/checkout@v6
3839

40+
- name: Setup cross-compilation toolchain
41+
if: matrix.cross
42+
uses: taiki-e/setup-cross-toolchain-action@v1
43+
with:
44+
target: ${{ matrix.target }}
45+
3946
- name: Get the release version from the tag
4047
shell: bash
4148
run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
4249

4350
- name: Install rust toolchain
4451
uses: actions-rust-lang/setup-rust-toolchain@v1
4552
with:
46-
cache-key: ${{ runner.os }}-cargo-${{ hashFiles('rust-toolchain.toml') }}-${{ hashFiles('Cargo.lock') }}
53+
cache-key: ${{ runner.os }}-${{ matrix.target }}-cargo-${{ hashFiles('rust-toolchain.toml') }}-${{ hashFiles('Cargo.lock') }}
4754
components: clippy, rustfmt
4855
target: ${{ matrix.target }}
4956

@@ -72,6 +79,7 @@ jobs:
7279
- name: Upload asset
7380
uses: softprops/action-gh-release@v3
7481
with:
82+
token: ${{ secrets.RELEASE_TOKEN }}
7583
append_body: true
7684
files: |
7785
${{ env.ASSET }}

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## [1.1.0] - 2026-05-14
8+
## [1.1.0] - 2026-05-15
99

1010
### Added
1111
- Release artifact for `aarch64-unknown-linux-gnu`

0 commit comments

Comments
 (0)