Skip to content

Commit 5ce9af2

Browse files
vincent-dfinityvincent-dfinity
authored
Merge branch 'master' into unity-ii-improvement
2 parents 0802e32 + abf2568 commit 5ce9af2

File tree

92 files changed

+10868
-36382
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+10868
-36382
lines changed

‎.github/workflows/motoko-encrypted-notes-vetkd-example.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
name: motoko-encrypted-notes
1+
name: motoko-encrypted-notes-vetkd
22
on:
33
push:
44
branches:
55
- master
66
pull_request:
77
paths:
88
- motoko/encrypted-notes-dapp-vetkd/**
9-
- .github/workflows/provision-darwin.sh
9+
- motoko/encrypted-notes-dapp-vetkd/provision-darwin.sh
1010
- .github/workflows/provision-linux.sh
11-
- .github/workflows/motoko-encrypted-notes-example.yml
11+
- .github/workflows/motoko-encrypted-notes-vetkd-example.yml
1212
concurrency:
1313
group: ${{ github.workflow }}-${{ github.ref }}
1414
cancel-in-progress: true

‎.github/workflows/motoko-encrypted-notes-vetkd-skip.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name: motoko-encrypted-notes
1+
name: motoko-encrypted-notes-vetkd
22
on:
33
pull_request:
44
paths-ignore:
55
- motoko/encrypted-notes-dapp-vetkd/**
6-
- .github/workflows/provision-darwin.sh
6+
- motoko/encrypted-notes-dapp-vetkd/provision-darwin.sh
77
- .github/workflows/provision-linux.sh
8-
- .github/workflows/motoko-encrypted-notes-example.yml
8+
- .github/workflows/motoko-encrypted-notes-vetkd-example.yml
99
concurrency:
1010
group: ${{ github.workflow }}-${{ github.ref }}
1111
cancel-in-progress: true

‎.github/workflows/motoko-icrc2-swap-example.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: motoko-icrc2-swap
2+
on:
3+
push:
4+
branches:
5+
- master
6+
pull_request:
7+
paths:
8+
- motoko/icrc2-swap/**
9+
- .github/workflows/provision-darwin.sh
10+
- .github/workflows/provision-linux.sh
11+
- .github/workflows/motoko-icrc2-swap-example.yaml
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.ref }}
14+
cancel-in-progress: true
15+
jobs:
16+
motoko-icrc2-swap-linux:
17+
runs-on: ubuntu-20.04
18+
steps:
19+
- uses: actions/checkout@v1
20+
- name: Provision Linux
21+
env:
22+
DFX_VERSION: 0.15.1
23+
run: bash .github/workflows/provision-linux.sh
24+
- name: Motoko ICRC2-Swap Linux
25+
run: |
26+
dfx start --background
27+
pushd motoko/icrc2-swap
28+
npm install
29+
sleep 10
30+
make test

‎.github/workflows/rust-encrypted-notes-vetkd-example.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
name: rust-encrypted-notes
1+
name: rust-encrypted-notes-vetkd
22
on:
33
push:
44
branches:
55
- master
66
pull_request:
77
paths:
88
- motoko/encrypted-notes-dapp-vetkd/**
9-
- .github/workflows/provision-darwin.sh
9+
- motoko/encrypted-notes-dapp-vetkd/provision-darwin.sh
1010
- .github/workflows/provision-linux.sh
11-
- .github/workflows/rust-encrypted-notes-example.yml
11+
- .github/workflows/rust-encrypted-notes-vetkd-example.yml
1212
concurrency:
1313
group: ${{ github.workflow }}-${{ github.ref }}
1414
cancel-in-progress: true

‎.github/workflows/rust-encrypted-notes-vetkd-skip.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name: rust-encrypted-notes
1+
name: rust-encrypted-notes-vetkd
22
on:
33
pull_request:
44
paths-ignore:
5-
- rust/encrypted-notes-dapp-vetkd/**
6-
- .github/workflows/provision-darwin.sh
5+
- motoko/encrypted-notes-dapp-vetkd/**
6+
- motoko/encrypted-notes-dapp-vetkd/provision-darwin.sh
77
- .github/workflows/provision-linux.sh
8-
- .github/workflows/rust-encrypted-notes-example.yml
8+
- .github/workflows/rust-encrypted-notes-vetkd-example.yml
99
concurrency:
1010
group: ${{ github.workflow }}-${{ github.ref }}
1111
cancel-in-progress: true

‎motoko/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ These examples show the Motoko language as a backend language for the IC, operat
2222
- [`quicksort`](https://github.com/dfinity/examples/tree/master/motoko/quicksort) -- sorting an array, via Quick Sort, in Motoko.
2323
- [`simple-to-do`](https://github.com/dfinity/examples/tree/master/motoko/simple-to-do) -- CRUD-like demo service, sans a front end; see also: `phone-book` and `superheroes`.
2424
- [`calc`](https://github.com/dfinity/examples/tree/master/motoko/calc) -- more advanced version of `counter` demo.
25+
- [`icrc2-swap`](https://github.com/dfinity/examples/tree/master/motoko/icrc2-swap) -- deposit, swap, and withdraw two ICRC-2 tokens.
2526

2627
## Minimal front end.
2728

@@ -42,4 +43,4 @@ These examples use a "conventional" front end component (via `React.Component`).
4243

4344
## Security Considerations and Security Best Practices
4445

45-
If you base your application on one of these examples, we recommend you familiarize yourself with and adhere to the [Security Best Practices](https://internetcomputer.org/docs/current/references/security/) for developing on the Internet Computer. The examples provided here may not implement all the best practices.
46+
If you base your application on one of these examples, we recommend you familiarize yourself with and adhere to the [Security Best Practices](https://internetcomputer.org/docs/current/references/security/) for developing on the Internet Computer. The examples provided here may not implement all the best practices.

0 commit comments

Comments
 (0)