Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
x86y committed Jun 25, 2023
1 parent c0605a6 commit 9270cc4
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 123 deletions.
29 changes: 18 additions & 11 deletions .github/workflows/compile.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Release
on: [push, pull_request]
on: [push]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CARGO_TERM_COLOR: always
Expand All @@ -18,26 +18,31 @@ jobs:
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
build/obj
build/obj2
key: ${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}
- name: Install Rust Windows target
run: rustup update && rustup target add x86_64-pc-windows-gnu
- name: Build bqn shared lib and wasm file
run: |
rustup update && rustup target add x86_64-pc-windows-gnu
sudo apt-get update
sudo apt-get install clang llvm
sudo apt-get install binutils-mingw-w64 mingw-w64
- name: Build bqn shared lib and wasm file
run: |
git clone https://github.com/dzaima/CBQN
cd CBQN
FFI=0 make shared-o3 notui=1
FFI=0 make wasi-reactor-o3 notui=1
wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/wasi-sdk-20.0-linux.tar.gz
tar xvf wasi-sdk-20.0-linux.tar.gz
FFI=0 make wasi-reactor-o3 notui=1 CC=./wasi-sdk-20.0/bin/clang
mv libcbqn.so BQN.wasm ../
- name: Build Linux
run: |
RUSTFLAGS="-L ${{ github.workspace }}" LD_LIBRARY_PATH="${{ github.workspace }}/libcbqn.so" cargo build --release
mv target/release/beacon ./beacon_x86_64-unknown-linux-gnu
# - name: Build Linux
# run: |
# RUSTFLAGS="-L ${{ github.workspace }}" LD_LIBRARY_PATH="${{ github.workspace }}/libcbqn.so" cargo build --release
# mv target/release/beacon ./beacon_x86_64-unknown-linux-gnu
- name: Build Windows
run: |
BQN_WASM=${{ github.workspace }}/BQN.wasm cargo build --release --target x86_64-pc-windows-gnu --no-default-features --features=bqnwasm
mv target/x86_64-pc-windows-gnu/release/beacon ./beacon_x86_64-pc-windows-gnu.exe
mv target/x86_64-pc-windows-gnu/release/beacon.exe ./beacon_x86_64-pc-windows-gnu.exe
- name: Release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
Expand All @@ -56,6 +61,8 @@ jobs:
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
build/obj
build/obj2
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- name: Install Rust ARM target
run: |
Expand Down
109 changes: 1 addition & 108 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ iced = { git = "https://github.com/iced-rs/iced", features = ["async-std", "debu
iced_core = { git = "https://github.com/iced-rs/iced", rev = "b38f7d28372712e345672515d8c1643bc040c1f1" }
iced_runtime = { git = "https://github.com/iced-rs/iced", rev = "b38f7d28372712e345672515d8c1643bc040c1f1" }
iced_style = { git = "https://github.com/iced-rs/iced", rev = "b38f7d28372712e345672515d8c1643bc040c1f1" }
itertools = "0.11.0"
tracing = "0.1.37"
tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
# itertools = "0.11.0"
# tracing = "0.1.37"
# tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
ngnk = { version = "0.2.3", optional = true}


Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pub static INPUT_ID: Lazy<text_input::Id> = Lazy::new(text_input::Id::unique);
static SCROLL_ID: Lazy<scrollable::Id> = Lazy::new(scrollable::Id::unique);

pub fn main() -> iced::Result {
tracing_subscriber::fmt::init();
// tracing_subscriber::fmt::init();
Beacon::run(Settings {
window: window::Settings {
size: (430, 800),
Expand Down

0 comments on commit 9270cc4

Please sign in to comment.