Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update depencies and add a glow feature #42

Merged
merged 5 commits into from
Jan 30, 2024
Merged

Update depencies and add a glow feature #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a99a340
Update dependencies
fengalin Jan 30, 2024
4a7f3af
Remove flume in favor of futures::channel::mpsc...
fengalin Jan 30, 2024
f12fc1b
Add glow feature and generate wgpu & glow variants for macOS
fengalin Jan 30, 2024
d4b016f
CI: update actions
fengalin Jan 30, 2024
8a37cd9
Update README.md
fengalin Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install deps
run: sudo apt install libwayland-dev libasound2-dev
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clippy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install deps
run: sudo apt install libwayland-dev libasound2-dev
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deny.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: EmbarkStudios/cargo-deny-action@v1
with:
log-level: warn
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fmt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install deps
run: sudo apt install libwayland-dev libasound2-dev
Expand Down
25 changes: 16 additions & 9 deletions .github/workflows/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install deps
run: sudo apt install libwayland-dev libasound2-dev libgl-dev libx11-xcb-dev libxcb1-dev libxcb-dri2-0-dev libxcb-icccm4-dev libxcursor-dev libxkbcommon-dev libxcb-shape0-dev libxcb-xfixes0-dev
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
shell: bash

- name: Upload linux packages
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.app_version }}-linux
path: packages/*
Expand All @@ -77,7 +77,7 @@ jobs:
runs-on: macos-11

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install latest Rust
uses: dtolnay/rust-toolchain@stable
Expand All @@ -102,14 +102,19 @@ jobs:
shell: bash

- name: Build for x86_64
run: cargo build --release
run: |
cargo build --release --no-default-features --features glow
mv target/release/${APP_NAME} target/release/${APP_NAME}-glow
cargo build --release

- name: Build for aarch64
run: |
export SDKROOT=$(xcrun -sdk macosx11.1 --show-sdk-path)
echo "SDKROOT=$SDKROOT"
export MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.1 --show-sdk-platform-version)
echo "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET"
cargo build --release --target=aarch64-apple-darwin --no-default-features --features glow
mv target/aarch64-apple-darwin/release/${APP_NAME} target/aarch64-apple-darwin/release/${APP_NAME}-glow
cargo build --release --target=aarch64-apple-darwin
env:
DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
Expand All @@ -121,9 +126,11 @@ jobs:
- name: Package
run: |
mkdir -p temp/${{ env.app_variant }}
cp README.md temp/${{ env.app_variant }}/
cp README.md temp/${{ env.app_variant }}
cargo-about generate -o temp/${{ env.app_variant }}/LICENSES.html about.hbs
lipo target/release/${APP_NAME} target/aarch64-apple-darwin/release/${APP_NAME} -output temp/${{ env.app_variant }}/${APP_NAME} -create
for BACKEND in "" "-glow"; do \
lipo target/release/${APP_NAME}${BACKEND} target/aarch64-apple-darwin/release/${APP_NAME}${BACKEND} -output temp/${{ env.app_variant }}/${APP_NAME}${BACKEND} -create; \
done
mkdir -p packages
cd packages
TAR=${{ env.app_variant }}.tar.gz
Expand All @@ -132,7 +139,7 @@ jobs:
shell: bash

- name: Upload macos packages
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.app_version }}-macos
path: packages/*
Expand All @@ -145,7 +152,7 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup MSVC shell
uses: ilammy/msvc-dev-cmd@v1
Expand Down Expand Up @@ -187,7 +194,7 @@ jobs:
Get-FileHash $archive -Algorithm SHA256 > "$archive.sha256"

- name: Upload windows packages
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.app_version }}-windows
path: packages/*
Expand Down
Loading