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.

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

Add macOS support for LAN #37

Merged
merged 3 commits into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 15 additions & 8 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,9 @@ jobs:
- runner: windows-latest
triple: x86_64-pc-windows-msvc
vscode-platform: win32-x64
# - runner: macos-latest
# triple: x86_64-apple-darwin
# vscode-platform: darwin-arm64
- runner: macos-latest
triple: aarch64-apple-darwin
vscode-platform: darwin-arm64
runs-on: ${{matrix.runner}}
env:
RUSTFLAGS: "-L ${{github.workspace}}"
Expand All @@ -185,7 +185,7 @@ jobs:
- name: Tool Setup
# rustc regression: https://github.com/rust-lang/rust/issues/130769
# Change to "update nightly" after resolved
run: rustup install nightly-2024-09-23 && rustup default nightly-2024-09-23
run: rustup install nightly && rustup default nightly
- name: Ensure Correct Target is Installed
run: rustup target add ${{matrix.triple}}
- name: Tool Versions
Expand All @@ -198,11 +198,16 @@ jobs:
repository: tektronix/libvisa-stub
latest: true
fileName: '*'
- name: Build
- name: Build LAN-only
run: |
git config --global credential.helper store
echo "https://${{vars.SERVICE_ACCOUNT_USER}}:${{secrets.SERVICE_ACCOUNT_PAT}}@github.com" > ~/.git-credentials
cargo build --target "${{matrix.triple}}" --release --package kic --package kic-discover
- name: Build VISA
if: ${{ matrix.runner != 'macos-latest' }}
run: |
git config --global credential.helper store
echo "https://${{vars.SERVICE_ACCOUNT_USER}}:${{secrets.SERVICE_ACCOUNT_PAT}}@github.com" > ~/.git-credentials
cargo build --target "${{matrix.triple}}" --release --package kic-visa --package kic-discover-visa
- name: Upload Artifacts
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -235,9 +240,11 @@ jobs:
vscode-platform: win32-x64
os: win32
arch: x64
# - runner: macos-latest
# triple: x86_64-apple-darwin
# vscode-platform: darwin-arm64
- runner: macos-latest
triple: aarch64-apple-darwin
vscode-platform: darwin-arm64
os: darwin
arch: arm64
steps:
- name: Update ClamAV
run: freshclam
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how

## [0.18.3]

### Added

- Add support for macOS (LAN only)

### Changed

- .script , .upgrade and .exit commands descriptions updated
Expand Down
Loading
Loading