Skip to content

Commit f2b0818

Browse files
author
Red Artist
committed
windows messed up line endings :(
1 parent 24b785f commit f2b0818

File tree

2 files changed

+36
-35
lines changed

2 files changed

+36
-35
lines changed
Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
on:
2-
push:
3-
branches:
4-
- master
5-
name: Check Rust Crate
6-
# This just runs the rust crate example to verify that it builds (no undefined references error)
7-
jobs:
8-
build:
9-
runs-on: ${{ matrix.os }}-latest
10-
strategy:
11-
matrix:
12-
os: [ubuntu, windows, macos]
13-
steps:
14-
- name: Checkout
15-
uses: actions/checkout@v4
16-
17-
- name: Install Glfw on Ubuntu
18-
if: matrix.os == 'ubuntu'
19-
# based on glfw/glfw's workflow
20-
run: sudo apt install -y libglfw3-dev libglfw3 libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev libwayland-dev libxkbcommon-dev
21-
22-
- name: Shared Build
23-
shell: bash
24-
run: |
25-
cargo run --example=empty --features=prebuilt_libs,sys,cache_libs
26-
cargo build --examples --features=prebuilt_libs,sys,cache_libs
27-
28-
- name: Static Build
29-
shell: bash
30-
if: matrix.os != 'macos'
31-
run: |
32-
cargo run --example=empty --features=prebuilt_libs,sys,debug_static_link
33-
cargo run --example=empty --features=prebuilt_libs,sys,static_link
34-
1+
on:
2+
push:
3+
branches:
4+
- master
5+
name: Check Rust Crate
6+
# This just runs the rust crate example to verify that it builds (no undefined references error)
7+
jobs:
8+
build:
9+
runs-on: ${{ matrix.os }}-latest
10+
strategy:
11+
matrix:
12+
os: [ubuntu, windows, macos]
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v4
16+
17+
- name: Install Glfw on Ubuntu
18+
if: matrix.os == 'ubuntu'
19+
# based on glfw/glfw's workflow
20+
run: sudo apt install -y libglfw3-dev libglfw3 libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev libwayland-dev libxkbcommon-dev
21+
22+
- name: Shared Build
23+
shell: bash
24+
run: |
25+
cargo run --example=empty --features=prebuilt_libs,sys,cache_libs
26+
cargo build --examples --features=prebuilt_libs,sys,cache_libs
27+
28+
- name: Static Build
29+
shell: bash
30+
if: matrix.os != 'macos'
31+
run: |
32+
cargo run --example=empty --features=prebuilt_libs,sys,debug_static_link
33+
cargo run --example=empty --features=prebuilt_libs,sys,static_link
34+

.github/workflows/assets.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ jobs:
2525
version-sdk: 22621
2626
features: 'OptionId.DesktopCPPx64,OptionId.DesktopCPPx86'
2727

28-
2928
- name: Ensure ENGINE_SHA is up to date.
3029
shell: bash
3130
run: |
@@ -58,6 +57,8 @@ jobs:
5857
cp ../github_ci.gclient .gclient
5958
gclient sync --delete_unversioned_trees --no-history --shallow
6059
# add the library_static target to BUILD.gn
60+
dos2unix ../build_impeller.sh
61+
dos2unix ../BUILD.gn.patch
6162
cat ../BUILD.gn.patch >> ./engine/src/flutter/impeller/toolkit/interop/BUILD.gn
6263
../build_impeller.sh release $UPLOAD_DIR
6364
../build_impeller.sh debug $UPLOAD_DIR

0 commit comments

Comments
 (0)