Merge pull request 'fix(ci): unset SODIUM_USE_PKG_CONFIG and use SODIUM_LIB_DIR in auto-tag.yml' (#111) from fix/unset-sodium-pkg-config-master into master
Some checks failed
Auto Tag / autotag (push) Successful in 16s
Auto Tag / wiki-sync (push) Successful in 15s
Sync Beta from Master / sync (push) Failing after 1m9s
Test / frontend-tests (push) Successful in 1m40s
Test / frontend-typecheck (push) Successful in 1m55s
Auto Tag / changelog (push) Successful in 1m59s
Auto Tag / build-macos-arm64 (push) Successful in 5m37s
Auto Tag / build-linux-amd64 (push) Failing after 4m38s
Test / rust-clippy (push) Has been cancelled
Test / rust-fmt-check (push) Has been cancelled
Test / rust-tests (push) Has been cancelled
Auto Tag / build-linux-arm64 (push) Has been cancelled
Auto Tag / build-windows-amd64 (push) Has been cancelled
Some checks failed
Auto Tag / autotag (push) Successful in 16s
Auto Tag / wiki-sync (push) Successful in 15s
Sync Beta from Master / sync (push) Failing after 1m9s
Test / frontend-tests (push) Successful in 1m40s
Test / frontend-typecheck (push) Successful in 1m55s
Auto Tag / changelog (push) Successful in 1m59s
Auto Tag / build-macos-arm64 (push) Successful in 5m37s
Auto Tag / build-linux-amd64 (push) Failing after 4m38s
Test / rust-clippy (push) Has been cancelled
Test / rust-fmt-check (push) Has been cancelled
Test / rust-tests (push) Has been cancelled
Auto Tag / build-linux-arm64 (push) Has been cancelled
Auto Tag / build-windows-amd64 (push) Has been cancelled
Reviewed-on: #111
This commit is contained in:
commit
df833e8464
@ -344,8 +344,9 @@ jobs:
|
||||
- name: Build
|
||||
env:
|
||||
APPIMAGE_EXTRACT_AND_RUN: "1"
|
||||
SODIUM_LIB_DIR: /usr/lib/x86_64-linux-gnu
|
||||
run: |
|
||||
apt-get update -qq && apt-get install -y --no-install-recommends libsodium-dev
|
||||
unset SODIUM_USE_PKG_CONFIG
|
||||
npm ci --legacy-peer-deps
|
||||
CI=true npx tauri build --target x86_64-unknown-linux-gnu
|
||||
- name: Upload artifacts
|
||||
@ -448,6 +449,7 @@ jobs:
|
||||
SODIUM_LIB_DIR: /usr/x86_64-w64-mingw32/lib
|
||||
SODIUM_STATIC: "1"
|
||||
run: |
|
||||
unset SODIUM_USE_PKG_CONFIG
|
||||
npm ci --legacy-peer-deps
|
||||
CI=true npx tauri build --target x86_64-pc-windows-gnu
|
||||
- name: Upload artifacts
|
||||
@ -630,13 +632,14 @@ jobs:
|
||||
AR_aarch64_unknown_linux_gnu: aarch64-linux-gnu-ar
|
||||
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
|
||||
PKG_CONFIG_SYSROOT_DIR: /usr/aarch64-linux-gnu
|
||||
PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig
|
||||
PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig:/usr/aarch64-linux-gnu/lib/pkgconfig
|
||||
PKG_CONFIG_ALLOW_CROSS: "1"
|
||||
OPENSSL_NO_VENDOR: "0"
|
||||
OPENSSL_STATIC: "1"
|
||||
APPIMAGE_EXTRACT_AND_RUN: "1"
|
||||
SODIUM_LIB_DIR: /usr/lib/aarch64-linux-gnu
|
||||
run: |
|
||||
apt-get update -qq && apt-get install -y --no-install-recommends libsodium-dev:arm64
|
||||
unset SODIUM_USE_PKG_CONFIG
|
||||
npm ci --legacy-peer-deps
|
||||
CI=true npx tauri build --target aarch64-unknown-linux-gnu --bundles deb,rpm
|
||||
- name: Upload artifacts
|
||||
|
||||
Loading…
Reference in New Issue
Block a user