Skip to content

Commit

Permalink
Merge branch 'main' into multiview
Browse files Browse the repository at this point in the history
  • Loading branch information
wusyong committed May 9, 2024
2 parents c298410 + 2cbdd49 commit 007d5d4
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 15 deletions.
16 changes: 9 additions & 7 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@ updates:
interval: "daily"
open-pull-requests-limit: 0
groups:
security-updates:
applies-to: "security-updates"
security-updates:
applies-to: security-updates
patterns:
- "*"
update-types:
- "patch"
- "minor"
ignore:
- dependency-name: "libservo"
allow:
Expand All @@ -19,15 +24,12 @@ updates:
prefix: ":arrow_up: [dependabot] "
# GHA
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
day: "sunday"
time: "10:00"
open-pull-requests-limit: 0
groups:
all-actions:
patterns: [ "*" ]
reviewers:
- "mikopet"
commit-message:
prefix: ":arrow_up: [dependabot] "

78 changes: 72 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Continuous Integration

on:
merge_group:
pull_request:
branches:
- main
Expand All @@ -15,13 +16,51 @@ env:
CN_APP_SLUG: verso-nightly

jobs:
pr-fast-check:
if: ${{ github.event_name == 'pull_request' }}
name: Pull Request Fast Check
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/checkout@v4

- name: Install Rust
uses: dsherret/rust-toolchain-file@v1

- name: Set env
run: echo "LIBCLANG_PATH=/usr/lib/llvm-14/lib" >> $GITHUB_ENV

- name: Install dependencies
run: |
sudo apt-get update
sudo apt install build-essential python3-pip ccache clang cmake curl \
g++ git gperf libdbus-1-dev libfreetype6-dev libgl1-mesa-dri \
libgles2-mesa-dev libglib2.0-dev libgstreamer-plugins-base1.0-dev \
gstreamer1.0-plugins-good libgstreamer-plugins-good1.0-dev \
gstreamer1.0-plugins-bad libgstreamer-plugins-bad1.0-dev \
gstreamer1.0-plugins-ugly gstreamer1.0-plugins-base \
libgstreamer-plugins-base1.0-dev gstreamer1.0-libav \
libgstrtspserver-1.0-dev gstreamer1.0-tools libges-1.0-dev \
libharfbuzz-dev liblzma-dev libunwind-dev libunwind-dev libvulkan1 \
libx11-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev \
libxmu-dev libxmu6 libegl1-mesa-dev llvm-dev m4 xorg-dev sway
- name: Check
run: cargo check

build-linux:
if: ${{ github.event_name != 'pull_request' }}
name: Build [Linux]
runs-on: ubuntu-latest
env:
RUSTC_WRAPPER: sccache
CCACHE: sccache
SCCACHE_GHA_ENABLED: 'true'
WAYLAND_DISPLAY: wayland-1
WLR_BACKENDS: headless
WLR_LIBINPUT_NO_DEVICES: 1
XDG_RUNTIME_DIR: /tmp
XDG_SESSION_TYPE: wayland
steps:
- name: Checkout the repository
uses: actions/checkout@v4
Expand All @@ -45,15 +84,21 @@ jobs:
libgstrtspserver-1.0-dev gstreamer1.0-tools libges-1.0-dev \
libharfbuzz-dev liblzma-dev libunwind-dev libunwind-dev libvulkan1 \
libx11-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev \
libxmu-dev libxmu6 libegl1-mesa-dev llvm-dev m4 xorg-dev
libxmu-dev libxmu6 libegl1-mesa-dev llvm-dev m4 xorg-dev sway
- name: Run sccache-cache
uses: mozilla-actions/[email protected].3
uses: Mozilla-Actions/[email protected].4

- name: Build
run: |
cargo build --release
# - name: Test
# # Run sway(wayland compositor) in the background, winit will use it
# run: |
# sway > /dev/null 2>&1 &
# cargo test --release

- name: Tar Binary
if: ${{ github.event_name == 'schedule' }}
run: tar -czvf verso-x86_64-unknown-linux-gnu.tar.gz -C ./target/release/ verso
Expand All @@ -66,6 +111,7 @@ jobs:
path: verso-x86_64-unknown-linux-gnu.tar.gz

build-windows:
if: ${{ github.event_name != 'pull_request' }}
name: Build [Windows]
runs-on: windows-latest
env:
Expand All @@ -85,12 +131,15 @@ jobs:
run: scoop install git python llvm cmake curl

- name: Run sccache-cache
uses: mozilla-actions/[email protected].3
uses: Mozilla-Actions/[email protected].4

- name: Build
run: |
cargo build --release
cargo test --release
# - name: Test
# run: |
# cargo test --release

- name: Tar Binary
if: ${{ github.event_name == 'schedule' }}
Expand All @@ -104,6 +153,7 @@ jobs:
path: verso-x86_64-pc-windows-msvc.tar.gz

build-macos:
if: ${{ github.event_name != 'pull_request' }}
name: Build [macOS]
strategy:
fail-fast: false
Expand All @@ -127,12 +177,15 @@ jobs:
run: brew install cmake pkg-config

- name: Run sccache-cache
uses: mozilla-actions/[email protected].3
uses: Mozilla-Actions/[email protected].4

- name: Build
run: |
cargo build --release
cargo test --release
# - name: Test
# run: |
# cargo test --release

- name: Tar Binary
if: ${{ github.event_name == 'schedule' }}
Expand All @@ -145,6 +198,19 @@ jobs:
name: verso-${{ matrix.platform.target }}
path: verso-${{ matrix.platform.target }}.tar.gz

build-result:
name: Build Result
runs-on: ubuntu-latest
if: always()
needs: ['build-macos', 'build-windows', 'build-linux']
steps:
- name: Success
if: ${{ !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }}
run: exit 0
- name: Failure
if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
run: exit 1

release-nightly:
if: ${{ github.event_name == 'schedule' }}
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

A web browser that plays old world blues to build new world hope.

https://github.com/wusyong/Yippee/assets/8409985/a7a92fa4-5980-44d1-a9b5-81ff23c01ba6
https://github.com/european-browser/verso/assets/8409985/a7a92fa4-5980-44d1-a9b5-81ff23c01ba6

# Usage

Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Verso Web Browser
//!
//! This is the documentation of Verso's types and items. See [Github page](https://github.com/wusyong/Verso) for more general introduction.
//! This is the documentation of Verso's types and items. See [Github page](https://github.com/european-browser/verso) for more general introduction.
#![deny(missing_docs)]

Expand Down

0 comments on commit 007d5d4

Please sign in to comment.