Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/rust/hello/follow-…
Browse files Browse the repository at this point in the history
…redirects-1.15.5
  • Loading branch information
dfx-json authored Jan 29, 2024
2 parents 7d3255c + 7403298 commit cf2f3cd
Show file tree
Hide file tree
Showing 17 changed files with 54 additions and 70 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/motoko-composite-query-example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Provision Darwin
env:
DFX_VERSION: 0.15.0-beta.1
run: bash .github/workflows/provision-darwin.sh
- name: Motoko Composite Query Darwin
run: |
Expand All @@ -33,8 +31,6 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Provision Linux
env:
DFX_VERSION: 0.15.0-beta.1
run: bash .github/workflows/provision-linux.sh
- name: Motoko Composite Query Linux
run: |
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/motoko-defi-example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
with:
submodules: recursive
- name: Provision Darwin
env:
DFX_VERSION: 0.15.3
run: bash .github/workflows/provision-darwin.sh
- name: Motoko Defi Darwin
run: |
Expand All @@ -38,8 +36,6 @@ jobs:
with:
submodules: recursive
- name: Provision Linux
env:
DFX_VERSION: 0.15.3
run: bash .github/workflows/provision-linux.sh
- name: Motoko Defi Linux
run: |
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/motoko-encrypted-notes-example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Provision Darwin
env:
DFX_VERSION: 0.14.2
run: bash .github/workflows/provision-darwin.sh
- name: Motoko Encrypted Notes Darwin (unit tests)
run: |
Expand All @@ -36,8 +34,6 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Provision Linux
env:
DFX_VERSION: 0.14.2
run: bash .github/workflows/provision-linux.sh
- name: Motoko Encrypted Notes Linux (unit tests)
run: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/motoko-icrc2-swap-example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Provision Linux
env:
DFX_VERSION: 0.15.1
run: bash .github/workflows/provision-linux.sh
- name: Motoko ICRC2-Swap Linux
run: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Provision Darwin
env:
DFX_VERSION: 0.15.3
run: bash .github/workflows/provision-darwin.sh
- name: Motoko Internet Identity Integration Darwin
run: |
Expand All @@ -32,8 +30,6 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Provision Linux
env:
DFX_VERSION: 0.15.3
run: bash .github/workflows/provision-linux.sh
- name: Motoko Internet Identity Integration Linux
run: |
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/motoko-vetkd-example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
- uses: actions/checkout@v1
- name: Provision Darwin
env:
DFX_VERSION: 0.14.2
NODE_VERSION: 19.8.1
run: bash .github/workflows/provision-darwin.sh
- name: Motoko vetKD Darwin
Expand All @@ -33,8 +32,6 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Provision Linux
env:
DFX_VERSION: 0.14.2
run: bash .github/workflows/provision-linux.sh
- name: Motoko vetKD Linux
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust-counter-example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Provision Darwin
run: DFX_VERSION="0.15.2" bash .github/workflows/provision-darwin.sh
run: bash .github/workflows/provision-darwin.sh
- name: Rust Counter Darwin
run: |
dfx start --background
Expand All @@ -30,7 +30,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Provision Linux
run: DFX_VERSION="0.15.2" bash .github/workflows/provision-linux.sh
run: bash .github/workflows/provision-linux.sh
- name: Rust Counter Linux
run: |
dfx start --background
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/rust-defi-example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
with:
submodules: recursive
- name: Provision Darwin
env:
DFX_VERSION: 0.15.3
run: bash .github/workflows/provision-darwin.sh
- name: Rust Defi Darwin
run: |
Expand All @@ -38,8 +36,6 @@ jobs:
with:
submodules: recursive
- name: Provision Linux
env:
DFX_VERSION: 0.15.3
run: bash .github/workflows/provision-linux.sh
- name: Rust Defi Linux
run: |
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/rust-encrypted-notes-example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Provision Darwin
env:
DFX_VERSION: 0.14.2
run: bash .github/workflows/provision-darwin.sh
- name: Rust Encrypted Notes Darwin (unit tests)
run: |
Expand All @@ -36,8 +34,6 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Provision Linux
env:
DFX_VERSION: 0.14.2
run: bash .github/workflows/provision-linux.sh
- name: Rust Encrypted Notes Linux (unit tests)
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust-hello-example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Provision Darwin
run: DFX_VERSION="0.15.2" bash .github/workflows/provision-darwin.sh
run: bash .github/workflows/provision-darwin.sh
- name: Rust Hello Darwin
run: |
dfx start --background
Expand All @@ -30,7 +30,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Provision Linux
run: DFX_VERSION="0.15.2" bash .github/workflows/provision-linux.sh
run: bash .github/workflows/provision-linux.sh
- name: Rust Hello Linux
run: |
dfx start --background
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust-performance_counters-example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Provision Darwin
run: DFX_VERSION="0.15.2" bash .github/workflows/provision-darwin.sh
run: bash .github/workflows/provision-darwin.sh
- name: Rust Performance Counters Darwin
run: |
dfx start --background
Expand All @@ -30,7 +30,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Provision Linux
run: DFX_VERSION="0.15.2" bash .github/workflows/provision-linux.sh
run: bash .github/workflows/provision-linux.sh
- name: Rust Performance Counters Linux
run: |
dfx start --background
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust-periodic_tasks-example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Provision Darwin
run: DFX_VERSION="0.15.2" bash .github/workflows/provision-darwin.sh
run: bash .github/workflows/provision-darwin.sh
- name: Rust Periodic Tasks Darwin
run: |
dfx start --background
Expand All @@ -30,7 +30,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Provision Linux
run: DFX_VERSION="0.15.2" bash .github/workflows/provision-linux.sh
run: bash .github/workflows/provision-linux.sh
- name: Rust Periodic Tasks Linux
run: |
dfx start --background
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust-qrcode-example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Provision Darwin
run: DFX_VERSION="0.15.2" bash .github/workflows/provision-darwin.sh
run: bash .github/workflows/provision-darwin.sh
- name: Rust QRCode Darwin
run: |
dfx start --background
Expand All @@ -30,7 +30,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Provision Linux
run: DFX_VERSION="0.15.2" bash .github/workflows/provision-linux.sh
run: bash .github/workflows/provision-linux.sh
- name: Rust QRCode Linux
run: |
dfx start --background
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/rust-vetkd-example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
- uses: actions/checkout@v1
- name: Provision Darwin
env:
DFX_VERSION: 0.14.2
NODE_VERSION: 19.8.1
run: bash .github/workflows/provision-darwin.sh
- name: Rust vetKD Darwin
Expand All @@ -33,8 +32,6 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Provision Linux
env:
DFX_VERSION: 0.14.2
run: bash .github/workflows/provision-linux.sh
- name: Rust vetKD Linux
run: |
Expand Down
58 changes: 37 additions & 21 deletions motoko/encrypted-notes-dapp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion motoko/encrypted-notes-dapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"babel-jest": "^27.4.6",
"daisyui": "^1.25.4",
"jest": "^27.4.7",
"postcss": "^8.4.5",
"postcss": "^8.4.31",
"rollup": "^2.3.4",
"rollup-plugin-css-only": "^3.1.0",
"rollup-plugin-inject": "^3.0.2",
Expand Down
12 changes: 6 additions & 6 deletions rust/send_http_post/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit cf2f3cd

Please sign in to comment.