Skip to content

Commit

Permalink
Merge branch 'dev' into quick_profile_msg_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
stavares843 authored Nov 7, 2023
2 parents a811252 + e01884f commit a3d8a14
Show file tree
Hide file tree
Showing 33 changed files with 572 additions and 419 deletions.
17 changes: 17 additions & 0 deletions .coderabbit.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
settings:
# Enables automatic reviewing of draft pull requests.
enable_draft_pr_reviews: true
# Disables generation of release notes.
disable_high_level_summary: true
# Comma separated list of keywords in the title that should be ignored.
ignored_pr_titles: "WIP"
# ISO Code for the review language.
review_language: "en"
# Disables review and other status comments.
disable_review_status: false
# Add walkthrough comment in a collapsible section.
collapse_walkthrough_comment: true
# Disable automatic code reviews for this repository.
disable_review: false
# If set to false, enables the "poem" feature.
disable_poem: true
2 changes: 1 addition & 1 deletion .github/workflows/build-dmg-universal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.70.0
toolchain: 1.73.0
override: true
components: rustfmt, clippy
- name: Install Dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-release-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.70.0
toolchain: 1.73.0
override: true
- run: cargo build --release -F production_mode
- run: bash build_linux_installer.sh uplink ${{ github.ref_name }} amd64
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-release-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Get rust toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: 1.70.0
toolchain: 1.73.0
target: x86_64-pc-windows-msvc
override: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.70.0
toolchain: 1.73.0
override: true
components: rustfmt, clippy
- run: cargo clippy --no-deps -- -D warnings
Expand Down
39 changes: 3 additions & 36 deletions .github/workflows/ui-test-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,6 @@ env:
CARGO_TERM_COLOR: always

jobs:
build-ubuntu:
runs-on: ubuntu-latest
steps:
- name: Checkout App directory 🔖
uses: actions/checkout@v3

- name: Get latest package list
run: sudo apt-get update

- name: Install libwebkit2gtk
run: sudo apt-get install -y build-essential pkg-config libssl-dev libgtk-3-dev libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev librust-alsa-sys-dev dpkg-dev gzip webkit2gtk-driver xvfb libxdo-dev

- name: Set up cargo cache 🛠️
uses: Swatinem/rust-cache@v2

- name: Install Rust 💿
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.70.0
override: true

- name: Build executable 🖥️
run: cargo build --release -F production_mode

build-mac:
runs-on: macos-13
steps:
Expand All @@ -50,7 +25,7 @@ jobs:
- name: Install Rust 💿
uses: actions-rs/toolchain@v1
with:
toolchain: 1.70.0
toolchain: 1.73.0
override: true
components: rustfmt, clippy

Expand Down Expand Up @@ -106,7 +81,7 @@ jobs:
- name: Install Rust 💿
uses: actions-rs/toolchain@v1
with:
toolchain: 1.70.0
toolchain: 1.73.0
override: true
components: rustfmt, clippy

Expand Down Expand Up @@ -475,14 +450,7 @@ jobs:
publish-results:
if: always()
needs:
[
build-ubuntu,
build-mac,
build-windows,
test-mac,
test-windows-chats,
test-windows,
]
[build-mac, build-windows, test-mac, test-windows-chats, test-windows]
runs-on: ubuntu-latest
permissions:
checks: write
Expand Down Expand Up @@ -574,7 +542,6 @@ jobs:
remove-artifacts:
needs:
[
build-ubuntu,
build-mac,
build-windows,
test-mac,
Expand Down
Loading

0 comments on commit a3d8a14

Please sign in to comment.