Skip to content

Commit

Permalink
Merge branch 'master' into sj/inter-canister-calls
Browse files Browse the repository at this point in the history
  • Loading branch information
Stanley Jones authored Feb 11, 2020
2 parents 666c0df + 94404ae commit 16f257e
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ install:
script:
- sh bootstrap.sh
- ID=$(xxd -p canisters/profile/_canister.id)
- CRC=$(python -c "import crc8;h=crc8.crc8();h.update('$ID'.decode('hex'));print(h.hexdigest())")
- wget -O index.html http://127.0.0.1:8000/?canisterId=ic:$ID$CRC
- CRC=$(python2 -c "import crc8;h=crc8.crc8();h.update('$ID'.decode('hex'));print(h.hexdigest())")
- wget -O index.html http://127.0.0.1:8000/?canisterId=ic:$ID$CRC
- cat index.html
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ RUN sudo apt-get install -y nodejs

# Install DFINITY SDK.
RUN wget https://sdk.dfinity.org/install.sh -O /tmp/install-sdk.sh
RUN DFX_VERSION=0.4.12 sh -c 'yes Y | sh /tmp/install-sdk.sh'
RUN DFX_VERSION=0.4.13 sh -c 'yes Y | sh /tmp/install-sdk.sh'
ENV PATH /home/developer/bin:${PATH}

# Create workspace directory.
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ docker run \
dfinity-lab/linkedup sh bootstrap.sh
```

Open the canister in your web browser.
Open the canister frontend in your web browser.
```bash
ID=$(xxd -p canisters/index/_canister.id)
CRC=$(python -c "import crc8;h=crc8.crc8();h.update('$ID'.decode('hex'));print(h.hexdigest())")
xdg-open "http://127.0.0.1:8000/?canisterId=$ID$CRC"
ID=$(xxd -u -p canisters/profile/_canister.id)
CRC=$(python2 -c "import crc8;h=crc8.crc8();h.update('$ID'.decode('hex'));print(h.hexdigest())")
xdg-open "http://127.0.0.1:8000/?canisterId=ic:$ID$CRC"
```
16 changes: 6 additions & 10 deletions package-lock.json

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

Binary file removed src/profile/public/.DS_Store
Binary file not shown.

0 comments on commit 16f257e

Please sign in to comment.