Skip to content

Commit

Permalink
ci: update image (#84)
Browse files Browse the repository at this point in the history
* ci: update msi images

* ci: update doc and asset names

* ci: syntax error
  • Loading branch information
CharlieC3 authored Jul 16, 2021
1 parent 46140c4 commit c137178
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 24 deletions.
17 changes: 9 additions & 8 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -263,22 +263,26 @@ jobs:
# Don't compress for Windows because winget can't yet unzip files
- name: Compress artifact (Not Windows)
if: matrix.os != 'windows-latest'
run: zip --junk-paths ${{ matrix.platform }} ./target/${{ matrix.target }}/release/clarinet
run: zip --junk-paths clarinet-${{ matrix.platform }} ./target/${{ matrix.target }}/release/clarinet

- name: Rename artifact (Windows)
if: matrix.os == 'windows-latest'
run: mv target/wix/*.msi clarinet-${{ matrix.platform }}.msi

# Separate uploads to prevent paths from being preserved
- name: Upload artifact (Not Windows)
if: matrix.os != 'windows-latest'
uses: actions/upload-artifact@v2
with:
name: clarinet-${{ matrix.platform }}
path: ./target/${{ matrix.target }}/release/clarinet
path: clarinet-${{ matrix.platform }}.zip

- name: Upload artifact (Windows)
if: matrix.os == 'windows-latest'
uses: actions/upload-artifact@v2
with:
name: clarinet-${{ matrix.platform }}
path: ./target/wix/*.msi
path: clarinet-${{ matrix.platform }}.msi

- name: Unit Tests
run: cargo test --release --locked --target ${{ matrix.target }}
Expand All @@ -302,18 +306,15 @@ jobs:
if: startsWith(github.ref, 'refs/tags/v') && matrix.os != 'windows-latest'
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{ matrix.platform }}.zip
asset_name: clarinet-${{ matrix.platform }}.zip
file: clarinet-${{ matrix.platform }}.zip
tag: ${{ github.ref }}

- name: Upload Artifacts to GH release (Windows)
uses: svenstaro/upload-release-action@v2
if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ./target/wix/*.msi
file_glob: true
asset_name: clarinet-${{ matrix.platform }}.msi
file: clarinet-${{ matrix.platform }}.msi
tag: ${{ github.ref }}

# Cleans the `./target` dir after the build such that only dependencies are cached on CI
Expand Down
26 changes: 12 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,18 @@ Blockstack. Smart contracts allow developers to encode essential business logic

## Installation

The recommended way to install Clarinet is by downloading a release from this repository. Other installation methods are
provided if you want to build from source or install through the Homebrew package manager.

### Install from Homebrew (MacOS)

```bash
brew install clarinet
```

### Install from winget (Windows)

```powershell
winget install clarinet
```

### Install from a binary release

Expand Down Expand Up @@ -55,18 +65,6 @@ cd clarinet
cargo install --path . --locked
```

### Install from Homebrew (MacOS)

```bash
brew install clarinet
```

### Install from winget (Windows)

```powershell
winget install clarinet
```

## Getting started with Clarinet

The following sections describe how to create a new project in Clarinet and populate it with smart contracts. Clarinet
Expand Down
Binary file added docs/images/clarinet-banner.bmp
Binary file not shown.
Binary file added docs/images/clarinet-dialog.bmp
Binary file not shown.
Binary file removed docs/images/clarinet.bmp
Binary file not shown.
4 changes: 2 additions & 2 deletions wix/main.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -168,15 +168,15 @@
The banner BMP dimensions are 493 x 58 pixels.
-->
<!--<WixVariable Id='WixUIBannerBmp' Value='wix\Banner.bmp'/>-->
<WixVariable Id='WixUIBannerBmp' Value='docs/images/clarinet-banner.bmp'/>

<!--
Disabling the dialog image in the installer requires commenting out or
removing the following `WixVariable` tag.
The dialog BMP dimensions are 493 x 312 pixels.
-->
<WixVariable Id='WixUIDialogBmp' Value='docs/images/clarinet.bmp'/>
<WixVariable Id='WixUIDialogBmp' Value='docs/images/clarinet-dialog.bmp'/>
</Product>

</Wix>

0 comments on commit c137178

Please sign in to comment.