Skip to content

Commit dda46c5

Browse files
authored
ci(conta): use conta from crates.io (#204)
* ci(conta): install conta in CI * chore(elko): remove clap
1 parent e7a060f commit dda46c5

File tree

11 files changed

+40
-23
lines changed

11 files changed

+40
-23
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: "Install conta"
2+
description: "Install conta for publishing packages"
3+
4+
runs:
5+
using: composite
6+
steps:
7+
- uses: actions/checkout@v4
8+
- uses: dtolnay/rust-toolchain@stable
9+
10+
- uses: actions/cache@v3
11+
with:
12+
path: ~/.cargo/bin/conta
13+
key: ${{ runner.os }}-conta
14+
15+
- name: Install Conta
16+
run: cargo install conta

.github/workflows/release.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@v4
16+
- uses: dtolnay/rust-toolchain@stable
17+
- uses: ./.github/actions/install-conta
1618

17-
- name: Setup rust toolchain
18-
uses: dtolnay/rust-toolchain@nightly
19-
20-
- name: Release packages to crates.io
21-
run: cargo run --release --package conta publish
19+
- name: Release packages on crates.io
20+
run: conta publish
2221
env:
2322
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}

Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ repository = "https://github.com/clearloop/zink.git"
2828
anyhow = "1.0.76"
2929
cargo_metadata = "0.18.1"
3030
ccli = "0.0.1"
31-
clap = "4.4.11"
3231
colored = "2.1.0"
3332
etc = "0.1.16"
3433
hex = "0.4.3"
@@ -66,6 +65,18 @@ zink-codegen = { path = "zink/codegen", version = "0.1.9" }
6665
zinkc = { path = "compiler", version = "0.1.9" }
6766
zint = { path = "zint", version = "0.1.9" }
6867

68+
[workspace.metadata.conta]
69+
packages = [
70+
"zabi",
71+
"zingen",
72+
"zinkc",
73+
"filetests",
74+
"zint",
75+
"zink-codegen",
76+
"zink",
77+
"elko"
78+
]
79+
6980
# Zink Programming Language
7081
# -------------------------
7182

Conta.toml

Lines changed: 0 additions & 10 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
[![telegram][telegram-badge]][telegram-group]
1212

1313
[The Zink project][book] mainly provides a singlepass compiler `zinkc` which compiles
14-
WASM to EVM bytecode, the source code of your smart contract could be any language you
15-
like!
14+
WASM to EVM bytecode, the source code of your smart contracts could be any language you like!
1615

1716
```mermaid
1817
flowchart LR

RELEASES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
- Remove ethers
99
- Move out ccli and conta
1010
- Use `anyhow::Result` instead for the result of `zint`
11+
- Remove clap in elko
1112

1213
### FIXED
1314

elko/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ repository.workspace = true
1111
[dependencies]
1212
anyhow.workspace = true
1313
ccli.workspace = true
14-
clap = { workspace = true, features = [ "derive" ] }
1514
cargo_metadata.workspace = true
1615
colored.workspace = true
1716
etc.workspace = true

elko/src/bin/elko.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
//! The package manager of zink.
22
#![deny(missing_docs)]
33

4-
use ccli::{clap::Subcommand, App, Parser, Result};
4+
use ccli::{
5+
clap::{self, Parser, Subcommand},
6+
App, Result,
7+
};
58
use elko::{Build, Compile, New};
69

710
/// Elko commands

elko/src/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! Command `Build`.
22
use crate::utils::WasmBuilder;
33
use anyhow::{anyhow, Result};
4-
use clap::Parser;
4+
use ccli::clap::{self, Parser};
55
use etc::{Etc, FileSystem};
66
use std::{env, fs, path::PathBuf};
77
use zinkc::Compiler;

0 commit comments

Comments
 (0)