From c493ed74e1b0df29b1f74e2a3a76a7807c8a8472 Mon Sep 17 00:00:00 2001 From: Shunsuke Shibayama Date: Wed, 4 Jan 2023 11:09:28 +0900 Subject: [PATCH] Update version (v0.6.1) --- .github/workflows/release.yml | 10 ++++++---- Cargo.lock | 10 +++++----- Cargo.toml | 10 +++++----- compiler/els/Cargo.toml | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a61e397c7..03b1dccd1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,11 +29,10 @@ jobs: # os: ubuntu-latest - target: aarch64-apple-darwin os: macos-latest - # - target: x86_64-unknown-linux-gnu - # os: ubuntu-latest - # Erg has to link to libc statically, so we need to use musl - - target: x86_64-unknown-linux-musl + - target: x86_64-unknown-linux-gnu os: ubuntu-latest + # - target: x86_64-unknown-linux-musl + # os: ubuntu-latest - target: x86_64-apple-darwin os: macos-latest - target: x86_64-pc-windows-msvc @@ -48,5 +47,8 @@ jobs: bin: erg target: ${{ matrix.target }} include: compiler/erg_compiler/lib + features: els env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # static linking to libc + RUSTFLAGS: ${{ (matrix.target == 'x86_64-unknown-linux-gnu' && '-C target-feature=+crt-static') || '' }} diff --git a/Cargo.lock b/Cargo.lock index 2cf4b3050..b30e44bce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -69,7 +69,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "els" -version = "0.6.1-nightly.1" +version = "0.1.13" dependencies = [ "erg_common", "erg_compiler", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "erg" -version = "0.6.1-nightly.1" +version = "0.6.1" dependencies = [ "els", "erg_common", @@ -90,7 +90,7 @@ dependencies = [ [[package]] name = "erg_common" -version = "0.6.1-nightly.1" +version = "0.6.1" dependencies = [ "backtrace-on-stack-overflow", "hermit-abi", @@ -100,7 +100,7 @@ dependencies = [ [[package]] name = "erg_compiler" -version = "0.6.1-nightly.1" +version = "0.6.1" dependencies = [ "erg_common", "erg_parser", @@ -108,7 +108,7 @@ dependencies = [ [[package]] name = "erg_parser" -version = "0.6.1-nightly.1" +version = "0.6.1" dependencies = [ "erg_common", "unicode-xid", diff --git a/Cargo.toml b/Cargo.toml index 4efd40ed6..28c282a47 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ members = [ ] [workspace.package] -version = "0.6.1-nightly.1" +version = "0.6.1" authors = ["erg-lang team "] license = "MIT OR Apache-2.0" edition = "2021" @@ -61,10 +61,10 @@ py_compatible = ["erg_compiler/py_compatible", "els/py_compatible"] els = ["erg_common/els", "erg_compiler/els", "dep:els"] [workspace.dependencies] -erg_common = { version = "0.6.1-nightly.1", path = "./compiler/erg_common" } -erg_parser = { version = "0.6.1-nightly.1", path = "./compiler/erg_parser" } -erg_compiler = { version = "0.6.1-nightly.1", path = "./compiler/erg_compiler" } -els = { version = "0.6.1-nightly.1", path = "./compiler/els" } +erg_common = { version = "0.6.1", path = "./compiler/erg_common" } +erg_parser = { version = "0.6.1", path = "./compiler/erg_parser" } +erg_compiler = { version = "0.6.1", path = "./compiler/erg_compiler" } +els = { version = "0.1.13", path = "./compiler/els" } [dependencies] erg_common = { workspace = true } diff --git a/compiler/els/Cargo.toml b/compiler/els/Cargo.toml index b174ff9d0..15244efac 100644 --- a/compiler/els/Cargo.toml +++ b/compiler/els/Cargo.toml @@ -2,7 +2,7 @@ name = "els" description = "An Erg compiler frontend for IDEs, implements LSP." documentation = "http://docs.rs/els" -version.workspace = true +version = "0.1.13" authors.workspace = true license.workspace = true edition.workspace = true