Skip to content

Commit

Permalink
Merge pull request #462 from demergent-labs/update_rust
Browse files Browse the repository at this point in the history
Increasing dfx to 0.17.0, now using dfxvm, increasing node to 20
  • Loading branch information
lastmjs authored Mar 26, 2024
2 parents c9128fc + e33537b commit c61fef1
Show file tree
Hide file tree
Showing 11 changed files with 2,967 additions and 718 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ jobs:
- if: ${{ needs.release-candidate-deploy.outputs.should_run_tests }}
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
- if: ${{ needs.release-candidate-deploy.outputs.should_run_tests }}
uses: actions/cache@v3
with:
Expand All @@ -173,9 +173,12 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.cache/dfinity
key: kybra-dfx-0.14.2
key: kybra-dfx-0.17.0
- if: ${{ needs.release-candidate-deploy.outputs.should_run_tests }}
run: DFX_VERSION=0.14.2 sh -ci "$(curl -fsSL https://sdk.dfinity.org/install.sh)" # Find latest dfx version at https://raw.githubusercontent.com/dfinity/sdk/public-manifest/manifest.json
name: Install dfx
run: |
DFXVM_INIT_YES=true DFX_VERSION=0.17.0 sh -ci "$(curl -fsSL https://sdk.dfinity.org/install.sh)"
echo "$HOME/.local/share/dfx/bin" >> $GITHUB_PATH
- if: ${{ needs.release-candidate-deploy.outputs.should_run_tests }}
working-directory: ${{ matrix.example_directories }}
run: curl https://pyenv.run | bash
Expand Down
6 changes: 3 additions & 3 deletions docs/installation.html
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ <h2 id="dependencies"><a class="header" href="#dependencies">Dependencies</a></h
<p>You should be using a *nix environment (Linux, Mac OS, <a href="https://learn.microsoft.com/en-us/windows/wsl/install">WSL if using Windows</a>) with bash and have the following installed on your system:</p>
<ul>
<li>Python 3.10.7</li>
<li>dfx 0.14.2</li>
<li>dfx 0.17.0</li>
<li>Python VS Code Extension</li>
</ul>
<h3 id="python-3107"><a class="header" href="#python-3107">Python 3.10.7</a></h3>
Expand All @@ -166,8 +166,8 @@ <h3 id="python-3107"><a class="header" href="#python-3107">Python 3.10.7</a></h3
~/.pyenv/bin/pyenv install 3.10.7
</code></pre>
<h3 id="dfx"><a class="header" href="#dfx">dfx</a></h3>
<p>Run the following command to install dfx 0.14.2:</p>
<pre><code class="language-bash">DFX_VERSION=0.14.2 sh -ci &quot;$(curl -fsSL https://sdk.dfinity.org/install.sh)&quot;
<p>Run the following command to install dfx 0.17.0:</p>
<pre><code class="language-bash">DFX_VERSION=0.17.0 sh -ci &quot;$(curl -fsSL https://sdk.dfinity.org/install.sh)&quot;
</code></pre>
<p>If after trying to run <code>dfx</code> commands you encounter an error such as <code>dfx: command not found</code>, you might need to add <code>$HOME/bin</code> to your path. Here's an example of doing this in your <code>.bashrc</code>:</p>
<pre><code class="language-bash">echo 'export PATH=&quot;$PATH:$HOME/bin&quot;' &gt;&gt; &quot;$HOME/.bashrc&quot;
Expand Down
6 changes: 3 additions & 3 deletions docs/print.html
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ <h2 id="dependencies"><a class="header" href="#dependencies">Dependencies</a></h
<p>You should be using a *nix environment (Linux, Mac OS, <a href="https://learn.microsoft.com/en-us/windows/wsl/install">WSL if using Windows</a>) with bash and have the following installed on your system:</p>
<ul>
<li>Python 3.10.7</li>
<li>dfx 0.14.2</li>
<li>dfx 0.17.0</li>
<li>Python VS Code Extension</li>
</ul>
<h3 id="python-3107"><a class="header" href="#python-3107">Python 3.10.7</a></h3>
Expand All @@ -354,8 +354,8 @@ <h3 id="python-3107"><a class="header" href="#python-3107">Python 3.10.7</a></h3
~/.pyenv/bin/pyenv install 3.10.7
</code></pre>
<h3 id="dfx"><a class="header" href="#dfx">dfx</a></h3>
<p>Run the following command to install dfx 0.14.2:</p>
<pre><code class="language-bash">DFX_VERSION=0.14.2 sh -ci &quot;$(curl -fsSL https://sdk.dfinity.org/install.sh)&quot;
<p>Run the following command to install dfx 0.17.0:</p>
<pre><code class="language-bash">DFX_VERSION=0.17.0 sh -ci &quot;$(curl -fsSL https://sdk.dfinity.org/install.sh)&quot;
</code></pre>
<p>If after trying to run <code>dfx</code> commands you encounter an error such as <code>dfx: command not found</code>, you might need to add <code>$HOME/bin</code> to your path. Here's an example of doing this in your <code>.bashrc</code>:</p>
<pre><code class="language-bash">echo 'export PATH=&quot;$PATH:$HOME/bin&quot;' &gt;&gt; &quot;$HOME/.bashrc&quot;
Expand Down
2 changes: 1 addition & 1 deletion docs/searchindex.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/searchindex.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/simple_user_accounts/src/main.did
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ service : () -> {
create_user : (text) -> (User);
get_all_users : () -> (vec User) query;
get_user_by_id : (text) -> (opt User) query;
}
}
Loading

0 comments on commit c61fef1

Please sign in to comment.