Skip to content

Commit d53a44e

Browse files
authored
ci: switch to shared actions (#357)
1 parent e5df912 commit d53a44e

13 files changed

+579
-578
lines changed

.cz.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
commitizen:
33
name: cz_conventional_commits
44
tag_format: $version
5-
update_changelog_on_bump: true
65
version: 3.0.2
76
version_files:
87
- Cargo.toml

.github/actions/setup-dfx/action.yml

-13
This file was deleted.

.github/actions/setup-pnpm/action.yml

-35
This file was deleted.

.github/workflows/build-and-test.yml

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
1-
name: Build and Test
1+
name: build_and_test
22

33
on:
44
push:
55
branches:
66
- main
77
pull_request:
8-
branches:
9-
- main
108

119
env:
1210
SCCACHE_GHA_ENABLED: 'true'
1311
RUSTC_WRAPPER: 'sccache'
1412

1513
jobs:
1614
build_and_test_rust:
17-
name: Build and Test Rust
15+
name: build_and_test_rust:required
1816
runs-on: ubuntu-latest
1917
steps:
2018
- name: Checkout
21-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2220

2321
- name: Run sccache-cache
2422
uses: mozilla-actions/[email protected]
@@ -39,15 +37,19 @@ jobs:
3937
run: cargo fmt --all -- --check
4038

4139
build_and_test_js:
42-
name: Build and Test JavaScript
40+
name: build_and_test_js:required
4341
runs-on: ubuntu-latest
4442
steps:
4543
- name: Checkout
46-
uses: actions/checkout@v3
44+
uses: actions/checkout@v4
4745

48-
- uses: ./.github/actions/setup-pnpm
46+
- name: Setup PNPM
47+
uses: dfinity/ci-tools/actions/setup-pnpm@main
4948

50-
- uses: ./.github/actions/setup-dfx
49+
- name: Setup DFX
50+
uses: dfinity/setup-dfx@main
51+
with:
52+
dfx-version: 'auto'
5153

5254
- name: Run sccache-cache
5355
uses: mozilla-actions/[email protected]
@@ -57,7 +59,7 @@ jobs:
5759
- name: Cargo metadata
5860
run: cargo metadata --format-version 1
5961

60-
- name: Install wasm-pack
62+
- name: Setup wasm-pack
6163
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
6264

6365
- name: Generate canister declarations

.github/workflows/check-commit-messages.yml

-29
This file was deleted.

.github/workflows/commitizen.yml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: commitizen
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
check_commit_messages:
8+
name: check_commit_messages:required
9+
uses: dfinity/ci-tools/.github/workflows/check-commit-messages.yaml@main
10+
with:
11+
starting_commit: '4b3de72e9b2a1ea5b700851c25db6f42cb55e8fa'
12+
13+
check_pr_title:
14+
name: check_pr_title:required
15+
uses: dfinity/ci-tools/.github/workflows/check-pr-title.yaml@main
+25-29
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Create Release PR
1+
name: create_release_pr
22

33
on: workflow_dispatch
44

@@ -8,17 +8,25 @@ env:
88

99
jobs:
1010
bump_version:
11-
name: Bump version
11+
name: bump_version
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
with:
1717
fetch-depth: 0
1818

19-
- uses: ./.github/actions/setup-pnpm
19+
- name: Setup Python
20+
uses: dfinity/ci-tools/actions/setup-python@main
2021

21-
- uses: ./.github/actions/setup-dfx
22+
- name: Setup Commitizen
23+
uses: dfinity/ci-tools/actions/setup-commitizen@main
24+
25+
- name: Setup PNPM
26+
uses: dfinity/ci-tools/actions/setup-pnpm@main
27+
28+
- name: Setup DFX
29+
uses: dfinity/setup-dfx@main
2230

2331
- name: Run sccache-cache
2432
uses: mozilla-actions/[email protected]
@@ -28,19 +36,15 @@ jobs:
2836
- name: Cargo metadata
2937
run: cargo metadata --format-version 1
3038

31-
- name: Install wasm-pack
39+
- name: Setup wasm-pack
3240
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
3341

34-
- name: Bump Version
35-
id: cz
36-
uses: commitizen-tools/commitizen-action@master
37-
with:
38-
commit: false
39-
push: false
40-
github_token: ${{ secrets.GITHUB_TOKEN }}
42+
- name: Bump version
43+
id: bump_version
44+
uses: dfinity/ci-tools/actions/bump-version@main
4145

4246
- name: Print Version
43-
run: echo "Bumping to version ${{ steps.cz.outputs.version }}"
47+
run: echo "Bumping to version ${{ steps.bump_version.outputs.version }}"
4448

4549
- name: Generate canister declarations
4650
run: dfx generate
@@ -51,22 +55,14 @@ jobs:
5155
pnpm build
5256
5357
- name: Create Pull Request
54-
uses: peter-evans/create-pull-request@v4
58+
uses: dfinity/ci-tools/actions/create-pr@main
5559
with:
56-
title: 'chore: release ${{ steps.cz.outputs.version }}'
57-
body: |
60+
branch_name: 'release/${{ steps.bump_version.outputs.version }}'
61+
pull_request_title: 'chore: release ${{ steps.bump_version.outputs.version }}'
62+
pull_request_body: |
5863
After merging this PR, tag the merge commit with:
5964
```shell
60-
git tag ${{ steps.cz.outputs.version }}
61-
git push origin ${{ steps.cz.outputs.version }}
65+
git tag ${{ steps.bump_version.outputs.version }}
66+
git push origin ${{ steps.bump_version.outputs.version }}
6267
```
63-
commit-message: 'chore: release ${{ steps.cz.outputs.version }}'
64-
branch: 'release/${{ steps.cz.outputs.version }}'
65-
add-paths: |
66-
.cz.yaml
67-
CHANGELOG.md
68-
Cargo.toml
69-
Cargo.lock
70-
packages/certificate-verification-js/package.json
71-
packages/ic-certification-testing-wasm/package.json
72-
packages/ic-response-verification-wasm/package.json
68+
commit_message: 'chore: release ${{ steps.bump_version.outputs.version }}'

.github/workflows/e2e-tests.yml

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
1-
name: e2e Tests
1+
name: e2e_tests
22

33
on:
44
push:
55
branches:
66
- main
77
pull_request:
8-
branches:
9-
- main
108

119
env:
1210
SCCACHE_GHA_ENABLED: 'true'
1311
RUSTC_WRAPPER: 'sccache'
1412

1513
jobs:
1614
e2e_tests:
17-
name: e2e Tests
15+
name: e2e_tests:required
1816
runs-on: ubuntu-latest
1917
steps:
2018
- name: Checkout
21-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2220

23-
- uses: ./.github/actions/setup-pnpm
21+
- name: Setup PNPM
22+
uses: dfinity/ci-tools/actions/setup-pnpm@main
2423

2524
- name: Run sccache-cache
2625
uses: mozilla-actions/[email protected]
@@ -31,7 +30,7 @@ jobs:
3130
path: tmp/
3231
key: ${{ runner.os }}-tmp
3332

34-
- name: Install wasm-pack
33+
- name: Setup wasm-pack
3534
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
3635

3736
- name: e2e tests
+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: generate_changelog
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
generate_changelog:
10+
uses: dfinity/ci-tools/.github/workflows/generate-changelog.yaml@main
11+
with:
12+
auto_merge: true
13+
secrets:
14+
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

+13-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Release
1+
name: release
22

33
on:
44
push:
@@ -11,17 +11,25 @@ env:
1111

1212
jobs:
1313
release:
14-
name: Release
14+
name: release
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
with:
2020
fetch-depth: 0
2121

22-
- uses: ./.github/actions/setup-pnpm
22+
- name: Setup Python
23+
uses: dfinity/ci-tools/actions/setup-python@main
2324

24-
- uses: ./.github/actions/setup-dfx
25+
- name: Setup Commitizen
26+
uses: dfinity/ci-tools/actions/setup-commitizen@main
27+
28+
- name: Setup PNPM
29+
uses: dfinity/ci-tools/actions/setup-pnpm@main
30+
31+
- name: Setup DFX
32+
uses: dfinity/setup-dfx@main
2533

2634
- name: Run sccache-cache
2735
uses: mozilla-actions/[email protected]
@@ -34,9 +42,6 @@ jobs:
3442
- name: Install wasm-pack
3543
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
3644

37-
- name: Setup Commitizen
38-
run: pip install commitizen==2.42.1
39-
4045
- name: Generate canister declarations
4146
run: dfx generate
4247

0 commit comments

Comments
 (0)