mirror of
https://github.com/vector-im/element-desktop.git
synced 2024-07-04 05:23:28 +00:00
Stash windows arm64 work
This commit is contained in:
parent
3d215dc777
commit
7b30329d29
2
.github/workflows/build_and_test.yaml
vendored
2
.github/workflows/build_and_test.yaml
vendored
|
@ -19,7 +19,7 @@ jobs:
|
||||||
uses: ./.github/workflows/build_windows.yaml
|
uses: ./.github/workflows/build_windows.yaml
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
arch: [x64, x86]
|
arch: [x64, x86, arm64]
|
||||||
with:
|
with:
|
||||||
arch: ${{ matrix.arch }}
|
arch: ${{ matrix.arch }}
|
||||||
|
|
||||||
|
|
17
.github/workflows/build_windows.yaml
vendored
17
.github/workflows/build_windows.yaml
vendored
|
@ -72,11 +72,6 @@ jobs:
|
||||||
path: |
|
path: |
|
||||||
./.hak
|
./.hak
|
||||||
|
|
||||||
- name: Set up build tools
|
|
||||||
uses: ilammy/msvc-dev-cmd@v1
|
|
||||||
with:
|
|
||||||
arch: ${{ steps.config.outputs.arch || inputs.arch }}
|
|
||||||
|
|
||||||
# ActiveTCL package on choco is from 2015,
|
# ActiveTCL package on choco is from 2015,
|
||||||
# this one is newer but includes more than we need
|
# this one is newer but includes more than we need
|
||||||
- name: Choco install tclsh
|
- name: Choco install tclsh
|
||||||
|
@ -109,6 +104,18 @@ jobs:
|
||||||
- name: Install Deps
|
- name: Install Deps
|
||||||
run: "yarn install --frozen-lockfile"
|
run: "yarn install --frozen-lockfile"
|
||||||
|
|
||||||
|
- name: Set up sqlcipher macros
|
||||||
|
if: steps.cache.outputs.cache-hit != 'true' && contains(inputs.arch, 'arm')
|
||||||
|
shell: pwsh
|
||||||
|
run: |
|
||||||
|
echo "NCC=${{ github.workspace }}\scripts\cl.bat" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
|
||||||
|
|
||||||
|
- name: Set up build tools
|
||||||
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
|
uses: ilammy/msvc-dev-cmd@v1
|
||||||
|
with:
|
||||||
|
arch: ${{ steps.config.outputs.arch || inputs.arch }}
|
||||||
|
|
||||||
- name: Build Natives
|
- name: Build Natives
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
|
|
|
@ -13,6 +13,12 @@ If you want to build native modules, make sure that the following tools are inst
|
||||||
- [Strawberry Perl](https://strawberryperl.com/)
|
- [Strawberry Perl](https://strawberryperl.com/)
|
||||||
- [Rustup](https://rustup.rs/)
|
- [Rustup](https://rustup.rs/)
|
||||||
- [NASM](https://www.nasm.us/)
|
- [NASM](https://www.nasm.us/)
|
||||||
|
|
||||||
|
You can install the above tools using [Chocolatey](https://chocolatey.org/install):
|
||||||
|
```cmd
|
||||||
|
choco install --no-progress -y git nodejs-lts yarn python StrawberryPerl rustup.install nasm magicsplat-tcl-tk
|
||||||
|
```
|
||||||
|
|
||||||
- [Build Tools for Visual Studio 2019](https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2019) with the following configuration:
|
- [Build Tools for Visual Studio 2019](https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2019) with the following configuration:
|
||||||
- On the Workloads tab:
|
- On the Workloads tab:
|
||||||
- Desktop & Mobile -> C++ build tools
|
- Desktop & Mobile -> C++ build tools
|
||||||
|
|
7
scripts/cl.bat
Normal file
7
scripts/cl.bat
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
REM Batch file to aid in cross-compiling sqlcipher for Windows ARM64
|
||||||
|
REM Full path should be passed to Makefile.msc as NCC env var
|
||||||
|
|
||||||
|
setlocal
|
||||||
|
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %VSCMD_ARG_HOST_ARCH%
|
||||||
|
cl.exe %*
|
||||||
|
endlocal
|
Loading…
Reference in a new issue