Skip to content

Commit 174f625

Browse files
mokeyishmokeyish
committed
👷 Add bump version
1 parent c304673 commit 174f625

File tree

4 files changed

+188
-74
lines changed

4 files changed

+188
-74
lines changed

‎.github/workflows/build.yml

+17-12
Original file line numberDiff line numberDiff line change
@@ -71,31 +71,36 @@ jobs:
7171
DIST_DIR: smartdns-${{ matrix.target }}
7272
steps:
7373
- name: Checkout
74-
uses: actions/checkout@master
74+
uses: actions/checkout@v4
7575

7676
- name: Install Rust Toolchain Components
7777
uses: dtolnay/rust-toolchain@stable
7878
with:
7979
toolchain: stable
8080
target: ${{ matrix.target }}
8181

82-
- uses: extractions/setup-just@v2
82+
- name: Install just
83+
uses: extractions/setup-just@v2
8384

84-
- name: cargo install patch-crate
85+
- name: Install cross
86+
uses: taiki-e/install-action@v2
87+
with:
88+
tool: cross
89+
90+
- name: Install cargo-edit
91+
uses: baptiste0928/cargo-install@v3
92+
with:
93+
crate: cargo-edit
94+
95+
- name: Install patch-crate
8596
uses: baptiste0928/cargo-install@v3
8697
with:
8798
crate: patch-crate
88-
89-
- name: Init
90-
run: just init
91-
shell: bash
9299

93100
- name: Build
94-
uses: actions-rsx/cargo@v2
95-
with:
96-
use-cross: ${{ matrix.os == 'ubuntu-latest' }}
97-
command: build
98-
args: --release --target=${{ matrix.target }}
101+
run: just build --release --target=${{ matrix.target }}
102+
env:
103+
USE_CROSS: ${{ matrix.os == 'ubuntu-latest' }}
99104

100105
- name: Pre publish
101106
run: |

‎.github/workflows/release.yml

+77-16
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,67 @@
22
name: Release
33

44
on:
5-
workflow_dispatch: {}
6-
release:
7-
types: [created]
5+
workflow_dispatch:
6+
inputs:
7+
bump:
8+
description: 'Bump version'
9+
required: true
10+
type: choice
11+
options: [major, minor, patch, rc, beta, alpha]
12+
default: 'minor'
813

914
jobs:
15+
bump:
16+
runs-on: ubuntu-latest
17+
outputs:
18+
version: ${{env.version}}
19+
steps:
20+
- name: Checkout
21+
uses: actions/checkout@v4
22+
with:
23+
persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal access token.
24+
fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository.
25+
26+
- name: Install just
27+
uses: extractions/setup-just@v2
28+
29+
- name: Install cross
30+
uses: taiki-e/install-action@v2
31+
with:
32+
tool: cross
33+
34+
- name: Install cargo-edit
35+
uses: baptiste0928/cargo-install@v3
36+
with:
37+
crate: cargo-edit
38+
39+
- name: Install patch-crate
40+
uses: baptiste0928/cargo-install@v3
41+
with:
42+
crate: patch-crate
43+
44+
- name: Bump version ${{ github.event.inputs.bump }}
45+
run: |
46+
just bump ${{ github.event.inputs.bump }}
47+
echo "version=$(just version)" >> "$GITHUB_ENV"
48+
49+
- name: Commit files
50+
run: |
51+
git config --local user.email "github-actions[bot]@users.noreply.github.com"
52+
git config --local user.name "github-actions[bot]"
53+
git commit -a -m "🔖 Bump version number to $version"
54+
git tag -a $version -m ""
55+
56+
- name: Push changes
57+
uses: ad-m/github-push-action@master
58+
with:
59+
github_token: ${{ secrets.GITHUB_TOKEN }}
60+
branch: ${{ github.ref }}
61+
tags: true
62+
1063
build:
1164
name: build ${{ matrix.target }}
65+
needs: [ "bump" ]
1266
strategy:
1367
fail-fast: false
1468
matrix:
@@ -71,31 +125,38 @@ jobs:
71125
DIST_DIR: smartdns-${{ matrix.target }}
72126
steps:
73127
- name: Checkout
74-
uses: actions/checkout@master
128+
uses: actions/checkout@v4
129+
with:
130+
ref: ${{ needs.bump.outputs.version }}
75131

76132
- name: Install Rust Toolchain Components
77133
uses: dtolnay/rust-toolchain@stable
78134
with:
79135
toolchain: stable
80136
target: ${{ matrix.target }}
81137

82-
- uses: extractions/setup-just@v2
138+
- name: Install just
139+
uses: extractions/setup-just@v2
83140

84-
- name: cargo install patch-crate
141+
- name: Install cross
142+
uses: taiki-e/install-action@v2
143+
with:
144+
tool: cross
145+
146+
- name: Install cargo-edit
147+
uses: baptiste0928/cargo-install@v3
148+
with:
149+
crate: cargo-edit
150+
151+
- name: Install patch-crate
85152
uses: baptiste0928/cargo-install@v3
86153
with:
87154
crate: patch-crate
88-
89-
- name: Init
90-
run: just init
91-
shell: bash
92155

93156
- name: Build
94-
uses: actions-rsx/cargo@v2
95-
with:
96-
use-cross: ${{ matrix.os == 'ubuntu-latest' }}
97-
command: build
98-
args: --release --target=${{ matrix.target }}
157+
run: just build --release --target=${{ matrix.target }}
158+
env:
159+
USE_CROSS: ${{ matrix.os == 'ubuntu-latest' }}
99160

100161
- name: Pre publish
101162
run: |
@@ -145,9 +206,9 @@ jobs:
145206

146207
- name: Publish release
147208
uses: softprops/[email protected]
148-
if: ${{ startsWith(github.ref, 'refs/tags/') }}
149209
with:
150210
draft: false
211+
tag_name: ${{ needs.bump.outputs.version }}
151212
files: |
152213
${{ env.archive_file }}
153214
${{ env.archive_file }}-sha256sum.txt

‎.github/workflows/test.yml

+57-37
Original file line numberDiff line numberDiff line change
@@ -28,31 +28,37 @@ jobs:
2828
runs-on: ${{matrix.os}}
2929
steps:
3030
- name: Checkout
31-
uses: actions/checkout@master
31+
uses: actions/checkout@v4
3232

3333
- name: Install Rust Toolchain Components
3434
uses: dtolnay/rust-toolchain@stable
3535
with:
3636
toolchain: stable
3737
target: ${{ matrix.target }}
3838

39-
- uses: extractions/setup-just@v2
39+
- name: Install just
40+
uses: extractions/setup-just@v2
4041

41-
- name: cargo install patch-crate
42+
- name: Install cross
43+
uses: taiki-e/install-action@v2
44+
with:
45+
tool: cross
46+
47+
- name: Install cargo-edit
48+
uses: baptiste0928/cargo-install@v3
49+
with:
50+
crate: cargo-edit
51+
52+
- name: Install patch-crate
4253
uses: baptiste0928/cargo-install@v3
4354
with:
4455
crate: patch-crate
45-
46-
- name: Init
47-
run: just init
48-
shell: bash
49-
56+
5057
- name: Test
51-
uses: actions-rsx/cargo@v2
52-
with:
53-
use-cross: ${{ matrix.os == 'ubuntu-latest' }}
54-
command: test
55-
args: --features=disable_icmp_ping
58+
run: just test --features=disable_icmp_ping
59+
env:
60+
USE_CROSS: ${{ matrix.os == 'ubuntu-latest' }}
61+
5662
cleanliness:
5763
name: cleanliness ${{ matrix.target }}
5864
strategy:
@@ -68,29 +74,38 @@ jobs:
6874
runs-on: ubuntu-latest
6975
steps:
7076
- name: Checkout
71-
uses: actions/checkout@master
77+
uses: actions/checkout@v4
78+
7279
- name: Install Rust Toolchain Components
7380
uses: dtolnay/rust-toolchain@stable
7481
with:
7582
toolchain: stable
7683
components: rustfmt, clippy
7784
target: ${{ matrix.target }}
7885

79-
- uses: extractions/setup-just@v2
86+
- name: Install just
87+
uses: extractions/setup-just@v2
88+
89+
- name: Install cross
90+
uses: taiki-e/install-action@v2
91+
with:
92+
tool: cross
8093

81-
- name: cargo install patch-crate
94+
- name: Install cargo-edit
95+
uses: baptiste0928/cargo-install@v3
96+
with:
97+
crate: cargo-edit
98+
99+
- name: Install patch-crate
82100
uses: baptiste0928/cargo-install@v3
83101
with:
84102
crate: patch-crate
85-
86-
- name: Init
87-
run: just init
88-
shell: bash
89-
90-
- name: Clippy
91-
run: cargo clippy
92-
- name: Rustfmt
93-
run: cargo fmt --all -- --check
103+
104+
- name: Clippy & Rustfmt
105+
run: just cleanliness
106+
env:
107+
USE_CROSS: ${{ matrix.os == 'ubuntu-latest' }}
108+
94109
compatibility:
95110
name: compatibility ${{ matrix.target }}
96111
strategy:
@@ -154,30 +169,35 @@ jobs:
154169
RUSTFLAGS: -D warnings
155170
steps:
156171
- name: Checkout
157-
uses: actions/checkout@master
172+
uses: actions/checkout@v4
158173

159174
- name: Install Rust Toolchain Components
160175
uses: dtolnay/rust-toolchain@stable
161176
with:
162177
toolchain: stable
163178
target: ${{ matrix.target }}
164179

165-
- uses: extractions/setup-just@v2
180+
- name: Install just
181+
uses: extractions/setup-just@v2
182+
183+
- name: Install cross
184+
uses: taiki-e/install-action@v2
185+
with:
186+
tool: cross
166187

167-
- name: cargo install patch-crate
188+
- name: Install cargo-edit
189+
uses: baptiste0928/cargo-install@v3
190+
with:
191+
crate: cargo-edit
192+
193+
- name: Install patch-crate
168194
uses: baptiste0928/cargo-install@v3
169195
with:
170196
crate: patch-crate
171-
172-
- name: Init
173-
run: just init
174-
shell: bash
175197

176198
- name: Check
177-
uses: actions-rsx/cargo@v2
178-
with:
179-
use-cross: ${{ matrix.os == 'ubuntu-latest' }}
180-
command: check
181-
args: --workspace --tests --benches --examples --target ${{ matrix.target }}
199+
run: just check --target ${{ matrix.target }}
200+
env:
201+
USE_CROSS: ${{ matrix.os == 'ubuntu-latest' }}
182202

183203

‎justfile

+37-9
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,58 @@
11

2+
cargo := if env_var_or_default('USE_CROSS', 'false') == "true" { "cross" } else { "cargo" }
3+
4+
# Increment manifest version: major, minor, patch, rc, beta, alpha
5+
bump +args:
6+
@cargo set-version --bump {{args}}
7+
8+
9+
# Print current version
10+
version:
11+
@cargo pkgid | cut -d@ -f2
12+
13+
14+
# Build
15+
build *args: init
16+
{{cargo}} build {{args}}
217

3-
build: init
4-
cargo build -r
518

619
# Run tests
7-
test: init
8-
cargo test
20+
test *args: init
21+
{{cargo}} test {{args}}
22+
23+
24+
# Analyze the package and report errors, but don't build object files
25+
check *args: init
26+
{{cargo}} check --workspace --tests --benches --examples {{args}}
27+
928

10-
# Run clippy
29+
# Run clippy fix
1130
clippy: init
12-
cargo clippy --fix --all
31+
{{cargo}} clippy --fix --all
1332

14-
# Check the format
33+
34+
# format the code
1535
fmt: init
16-
cargo fmt --all
36+
{{cargo}} fmt --all
37+
38+
39+
# Check the clippy and format.
40+
cleanliness: init
41+
cargo clippy
42+
cargo fmt --all -- --check
43+
1744

1845
# cleanup the workspace
1946
clean:
2047
cargo clean
2148

49+
2250
apply-patch: init
2351
cargo patch-crate -f
2452

53+
2554
# Initialize all tools needed
2655
init:
2756
@cargo patch-crate --version || cargo install patch-crate
2857
@cargo set-version --version || cargo install cargo-edit
2958
@#@cargo patch-crate
30-

0 commit comments

Comments
 (0)