Skip to content

Commit

Permalink
[mod] 去除编译失败的 target, 修改编译脚本
Browse files Browse the repository at this point in the history
  • Loading branch information
Borber committed Aug 2, 2023
1 parent ba2ed0f commit 124143d
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 9 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ jobs:
- arm-unknown-linux-musleabihf
- aarch64-unknown-linux-gnu
- aarch64-unknown-linux-musl
- mips-unknown-linux-musl
- mips-unknown-linux-gnu
- mipsel-unknown-linux-musl

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -96,7 +93,6 @@ jobs:
RUST_BACKTRACE: full
strategy:
matrix:
# os: [ubuntu-latest, macos-latest]
os: [macos-latest]
target:
- x86_64-apple-darwin
Expand All @@ -108,7 +104,6 @@ jobs:
if: runner.os == 'macOS'
run: |
brew install gnu-tar
# echo "::add-path::/usr/local/opt/gnu-tar/libexec/gnubin"
echo "/usr/local/opt/gnu-tar/libexec/gnubin" >> $GITHUB_PATH
- name: Install Rust
Expand Down
1 change: 1 addition & 0 deletions TODO.md
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
- tauri github action build and release support
- 改进编译脚本, 目前支持 windows, linux, macos
2 changes: 1 addition & 1 deletion build/build-host-release
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ done
BUILD_FEATURES+=${BUILD_EXTRA_FEATURES}

ROOT_DIR=$(cd $(dirname $0) && pwd)
VERSION=$(grep -E '^version' "${ROOT_DIR}/../seam/crates/cli/Cargo.toml" | awk '{print $3}' | sed 's/"//g')
VERSION=$(grep -E '^version' "${ROOT_DIR}/../crates/cli/Cargo.toml" | awk '{print $3}' | sed 's/"//g')
HOST_TRIPLE=$(rustc -Vv | grep 'host:' | awk '{print $2}')

echo "Started build release ${VERSION} for ${HOST_TRIPLE} (target: ${BUILD_TARGET}) with features \"${BUILD_FEATURES}\"..."
Expand Down
2 changes: 1 addition & 1 deletion build/build-host-release.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if (!$?) {
exit $LASTEXITCODE
}

$Version = (Select-String -Pattern '^version *= *"([^"]*)"$' -Path "${PSScriptRoot}\..\seam\crates\cli\Cargo.toml" | ForEach-Object { $_.Matches.Value }).split()[-1]
$Version = (Select-String -Pattern '^version *= *"([^"]*)"$' -Path "${PSScriptRoot}\..\crates\cli\Cargo.toml" | ForEach-Object { $_.Matches.Value }).split()[-1]
$Version = $Version -replace '"'

$PackageReleasePath = "${PSScriptRoot}\release"
Expand Down
2 changes: 1 addition & 1 deletion build/build-release
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Path: build\release

CUR_DIR=$(cd $(dirname $0) && pwd)
VERSION=$(grep -E '^version' ${CUR_DIR}/../seam/crates/cli/Cargo.toml | awk '{print $3}' | sed 's/"//g')
VERSION=$(grep -E '^version' ${CUR_DIR}/../crates/cli/Cargo.toml | awk '{print $3}' | sed 's/"//g')

## Disable macos ACL file
if [[ "$(uname -s)" == "Darwin" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion build/build-release-zigbuild
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

CUR_DIR=$(cd $(dirname $0) && pwd)
VERSION=$(grep -E '^version' ${CUR_DIR}/../seam/crates/cli/Cargo.toml | awk '{print $3}' | sed 's/"//g')
VERSION=$(grep -E '^version' ${CUR_DIR}/../crates/cli/Cargo.toml | awk '{print $3}' | sed 's/"//g')

## Disable macos ACL file
if [[ "$(uname -s)" == "Darwin" ]]; then
Expand Down

0 comments on commit 124143d

Please sign in to comment.