Skip to content

Commit fc3e1da

Browse files
authored
Merge pull request #26 from OSCPS-Project/connector_consolidation
consolidated streams into 1 struct
2 parents 531c81f + 4ce96c8 commit fc3e1da

16 files changed

Lines changed: 1379 additions & 441 deletions

File tree

.github/workflows/check-docs.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ on:
55
branches:
66
- main
77
- develop
8-
push:
9-
branches:
10-
- main
11-
- develop
8+
release:
9+
types: [published]
1210

1311
jobs:
1412
lint:
@@ -40,7 +38,6 @@ jobs:
4038
run: |
4139
sudo apt-get update
4240
sudo apt-get install -y \
43-
libwebkit2gtk-4.0-dev \
4441
build-essential \
4542
curl \
4643
wget \

.github/workflows/release.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: OSCPS_Release_Workflow
2+
3+
on:
4+
workflow_dispatch: # Enables manual triggering from GitHub Actions UI
5+
6+
jobs:
7+
build:
8+
name: Build and Release
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- name: Checkout repository
13+
uses: actions/checkout@v4
14+
15+
- name: Install Rust
16+
uses: dtolnay/rust-toolchain@stable
17+
18+
- name: Build release binary
19+
run: cargo build --release
20+
21+
- name: Compress binary
22+
run: |
23+
mkdir -p release
24+
cp target/release/your-binary-name release/
25+
cd release
26+
tar -czvf your-binary-name-linux.tar.gz your-binary-name
27+
shell: bash
28+
29+
- name: Create GitHub Release and Upload Binary
30+
uses: softprops/action-gh-release@v2
31+
with:
32+
files: release/your-binary-name-linux.tar.gz
33+
env:
34+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
35+

.github/workflows/rust-tests.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
name: Rust Tests
22

33
on:
4-
push:
5-
branches:
6-
- main
7-
- develop
84
pull_request:
95
branches:
106
- main
@@ -45,7 +41,6 @@ jobs:
4541
run: |
4642
sudo apt-get update
4743
sudo apt-get install -y \
48-
libwebkit2gtk-4.0-dev \
4944
build-essential \
5045
curl \
5146
wget \

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[workspace]
22
resolver = "2"
33

4-
members = [
4+
members = [ "oscps-gui",
55
"oscps-lib",
66
]

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# OSCPS (Open Sourced Chemical Engineering Process Simulator)
1+
# OSCPS (Open Source Chemical Process Simulator)
22

3-
![Rust Tests](https://github.com/OSCPS-Project/OSCPS/actions/workflows/rust-tests.yml/badge.svg)
4-
![Documentation](https://github.com/OSCPS-Project/OSCPS/actions/workflows/check-docs.yml/badge.svg)
3+
![Rust Tests](https://github.com/OSCPS-Project/OSCPS/actions/workflows/rust-tests.yml/badge.svg?branch=develop)
4+
![Documentation](https://github.com/OSCPS-Project/OSCPS/actions/workflows/check-docs.yml/badge.svg?branch=develop)
55

6-
Developing a dynamic & steady-state chemical process simulator using a Rust backend and a iced-rs frontend. This project aims to create a much better version of ASPEN that will also be open-sourced.
6+
Developing a dynamic & steady-state chemical process simulator using a Rust-based backend and frontend. This project aims to create a much better version of ASPEN that will also be open-sourced.
77

88
## Authors
99

oscps-gui/Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
[package]
22
name = "oscps-gui"
33
version = "0.1.0"
4+
authors = ["Nathaniel Thomas <nathaniel@swbell.net>", "Bhargav Akula <bhargavakula01>"]
45
edition = "2021"
56

67
[dependencies]
7-
iced = "0.13.1"
8+
env_logger = "0.11.6"
9+
iced = {version = "0.13.1", features = ["canvas", "debug", "lazy"]}
10+
log = "0.4"

0 commit comments

Comments
 (0)