Skip to content

Commit 8c1f7ec

Browse files
sesi200sesi200
authored
Merge branch 'master' into andriy/update-qrcode
2 parents 3eddcde + c384d3b commit 8c1f7ec

32 files changed

+1637
-6330
lines changed

‎.github/workflows/rust-counter-example.yml

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: rust-counter
2+
on:
3+
push:
4+
branches:
5+
- master
6+
pull_request:
7+
paths:
8+
- rust/counter/**
9+
- .github/workflows/provision-darwin.sh
10+
- .github/workflows/provision-linux.sh
11+
- .github/workflows/rust-counter-example.yml
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.ref }}
14+
cancel-in-progress: true
15+
jobs:
16+
rust-counter-darwin:
17+
runs-on: macos-12
18+
steps:
19+
- uses: actions/checkout@v1
20+
- name: Provision Darwin
21+
run: DFX_VERSION="0.15.2" bash .github/workflows/provision-darwin.sh
22+
- name: Rust Counter Darwin
23+
run: |
24+
dfx start --background
25+
pushd rust/counter
26+
make test
27+
popd
28+
rust-counter-linux:
29+
runs-on: ubuntu-20.04
30+
steps:
31+
- uses: actions/checkout@v1
32+
- name: Provision Linux
33+
run: DFX_VERSION="0.15.2" bash .github/workflows/provision-linux.sh
34+
- name: Rust Counter Linux
35+
run: |
36+
dfx start --background
37+
pushd rust/counter
38+
make test
39+
popd

‎.github/workflows/rust-counter-skip.yml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: rust-counter
2+
on:
3+
pull_request:
4+
paths-ignore:
5+
- rust/counter/**
6+
- .github/workflows/provision-darwin.sh
7+
- .github/workflows/provision-linux.sh
8+
- .github/workflows/rust-counter-example.yml
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
jobs:
13+
build:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- run: echo 'Not needed - relevant folder not touched'

‎.github/workflows/rust-hello-example.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v1
2020
- name: Provision Darwin
21-
run: bash .github/workflows/provision-darwin.sh
21+
run: DFX_VERSION="0.15.2" bash .github/workflows/provision-darwin.sh
2222
- name: Rust Hello Darwin
2323
run: |
2424
dfx start --background
@@ -30,7 +30,7 @@ jobs:
3030
steps:
3131
- uses: actions/checkout@v1
3232
- name: Provision Linux
33-
run: bash .github/workflows/provision-linux.sh
33+
run: DFX_VERSION="0.15.2" bash .github/workflows/provision-linux.sh
3434
- name: Rust Hello Linux
3535
run: |
3636
dfx start --background

‎.github/workflows/rust-performance_counters-example.yaml

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: rust-performance_counters
2+
on:
3+
push:
4+
branches:
5+
- master
6+
pull_request:
7+
paths:
8+
- rust/performance_counters/**
9+
- .github/workflows/provision-darwin.sh
10+
- .github/workflows/provision-linux.sh
11+
- .github/workflows/rust-performance_counters-example.yaml
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.ref }}
14+
cancel-in-progress: true
15+
jobs:
16+
rust-performance_counters-example-darwin:
17+
runs-on: macos-12
18+
steps:
19+
- uses: actions/checkout@v1
20+
- name: Provision Darwin
21+
run: DFX_VERSION="0.15.2" bash .github/workflows/provision-darwin.sh
22+
- name: Rust Performance Counters Darwin
23+
run: |
24+
dfx start --background
25+
pushd rust/performance_counters
26+
make test
27+
popd
28+
rust-performance_counters-example-linux:
29+
runs-on: ubuntu-20.04
30+
steps:
31+
- uses: actions/checkout@v1
32+
- name: Provision Linux
33+
run: DFX_VERSION="0.15.2" bash .github/workflows/provision-linux.sh
34+
- name: Rust Performance Counters Linux
35+
run: |
36+
dfx start --background
37+
pushd rust/performance_counters
38+
make test
39+
popd

‎.github/workflows/rust-performance_counters-skip.yaml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: rust-performance_counters
2+
on:
3+
pull_request:
4+
paths-ignore:
5+
- rust/performance_counters/**
6+
- .github/workflows/provision-darwin.sh
7+
- .github/workflows/provision-linux.sh
8+
- .github/workflows/rust-performance_counters-example.yaml
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
jobs:
13+
rust-performance_counters-example-darwin:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- run: echo 'Not needed - relevant folder not touched'
17+
rust-performance_counters-example-linux:
18+
runs-on: ubuntu-latest
19+
steps:
20+
- run: echo 'Not needed - relevant folder not touched'

‎.github/workflows/rust-periodic_tasks-example.yaml

+2-6
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v1
2020
- name: Provision Darwin
21-
env:
22-
DFX_VERSION: 0.13.1
23-
run: bash .github/workflows/provision-darwin.sh
21+
run: DFX_VERSION="0.15.2" bash .github/workflows/provision-darwin.sh
2422
- name: Rust Periodic Tasks Darwin
2523
run: |
2624
dfx start --background
@@ -32,9 +30,7 @@ jobs:
3230
steps:
3331
- uses: actions/checkout@v1
3432
- name: Provision Linux
35-
env:
36-
DFX_VERSION: 0.13.1
37-
run: bash .github/workflows/provision-linux.sh
33+
run: DFX_VERSION="0.15.2" bash .github/workflows/provision-linux.sh
3834
- name: Rust Periodic Tasks Linux
3935
run: |
4036
dfx start --background

0 commit comments

Comments
 (0)