Skip to content

Commit

Permalink
Merge branch 'next' into incognito
Browse files Browse the repository at this point in the history
  • Loading branch information
amrbashir committed Jun 6, 2023
2 parents 2a65e66 + 3480047 commit 7c1ad96
Show file tree
Hide file tree
Showing 18 changed files with 244 additions and 248 deletions.
6 changes: 6 additions & 0 deletions .changes/cli-windows-arm64.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'tauri-cli': minor
'@tauri-apps/cli': minor
---

Provide prebuilt CLIs for Windows ARM64 targets.
5 changes: 5 additions & 0 deletions .changes/event-api-window-label.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tauri-apps/api": patch
---

Expose the window target option on event APIs.
8 changes: 4 additions & 4 deletions .github/workflows/publish-cli-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ jobs:
build: yarn build:release --target i686-pc-windows-msvc
target: i686-pc-windows-msvc
architecture: x64
- host: windows-latest
architecture: x64
target: aarch64-pc-windows-msvc
build: yarn build:release --target aarch64-pc-windows-msvc --features native-tls-vendored --cargo-flags="--no-default-features"
- host: ubuntu-20.04
target: x86_64-unknown-linux-gnu
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian
Expand Down Expand Up @@ -84,10 +88,6 @@ jobs:
rustup target add aarch64-unknown-linux-musl
yarn build:release --target aarch64-unknown-linux-musl
/aarch64-linux-musl-cross/bin/aarch64-linux-musl-strip *.node
#- host: windows-latest
# architecture: x64
# target: aarch64-pc-windows-msvc
# build: yarn build:release --target aarch64-pc-windows-msvc
name: stable - ${{ matrix.settings.target }} - node@16
runs-on: ${{ matrix.settings.host }}
steps:
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/publish-cli-rs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,23 @@ jobs:
- os: ubuntu-20.04
rust_target: x86_64-unknown-linux-gnu
ext: ''
args: ''
- os: macos-latest
rust_target: x86_64-apple-darwin
ext: ''
args: ''
- os: macos-latest
rust_target: aarch64-apple-darwin
ext: ''
args: ''
- os: windows-latest
rust_target: x86_64-pc-windows-msvc
ext: '.exe'
args: ''
- os: windows-latest
rust_target: aarch64-pc-windows-msvc
ext: '.exe'
args: '--no-default-features --features native-tls-vendored'

steps:
- uses: actions/checkout@v3
Expand All @@ -53,7 +61,7 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: build
args: --manifest-path ./tooling/cli/Cargo.toml --release
args: --manifest-path ./tooling/cli/Cargo.toml --release ${{ matrix.config.args }}

- name: Upload CLI
uses: actions/upload-artifact@v3
Expand Down
32 changes: 24 additions & 8 deletions .github/workflows/test-cli-rs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,40 @@ concurrency:

jobs:
test:
runs-on: ${{ matrix.platform }}
runs-on: ${{ matrix.platform.os }}

strategy:
fail-fast: false
matrix:
platform: [ubuntu-latest, macos-latest, windows-latest]
platform:
- {
target: x86_64-pc-windows-msvc,
os: windows-latest
}
- {
target: aarch64-pc-windows-msvc,
os: windows-latest,
args: --no-default-features --features native-tls-vendored
}
- {
target: x86_64-unknown-linux-gnu,
os: ubuntu-latest
}
- {
target: x86_64-apple-darwin,
os: macos-latest
}

steps:
- uses: actions/checkout@v2

- name: install stable
uses: actions-rs/toolchain@v1
- name: 'Setup Rust'
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
override: true
targets: ${{ matrix.platform.target }}

- name: install Linux dependencies
if: matrix.platform == 'ubuntu-latest'
if: matrix.platform.os == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev
Expand All @@ -54,4 +70,4 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: build
args: --manifest-path ./tooling/cli/Cargo.toml
args: --manifest-path ./tooling/cli/Cargo.toml ${{ matrix.platform.args }}
2 changes: 1 addition & 1 deletion core/tauri/scripts/bundle.global.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tooling/api/docs/js-api.json

Large diffs are not rendered by default.

Loading

0 comments on commit 7c1ad96

Please sign in to comment.