Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3752419075 |
No files matched your search
@@ -45,7 +45,6 @@ jobs:
|
|||||||
deb: true
|
deb: true
|
||||||
deb_arch: arm64
|
deb_arch: arm64
|
||||||
pkg_arch: aarch64
|
pkg_arch: aarch64
|
||||||
gnu_target: aarch64-unknown-linux-gnu
|
|
||||||
- os: macos-latest
|
- os: macos-latest
|
||||||
target: aarch64-apple-darwin
|
target: aarch64-apple-darwin
|
||||||
asset: tsunagi-macos-aarch64
|
asset: tsunagi-macos-aarch64
|
||||||
@@ -111,11 +110,19 @@ jobs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
export RUSTFLAGS="${RUSTFLAGS:-} -A linker_messages"
|
|
||||||
if [[ "${{ runner.os }}" == "Linux" ]]; then
|
if [[ "${{ runner.os }}" == "Linux" ]]; then
|
||||||
rustup target add "${{ matrix.gnu_target }}"
|
if [[ -n "${{ matrix.gnu_target }}" ]]; then
|
||||||
cargo zigbuild --release --locked \
|
# tray-icon links GTK and libappindicator through pkg-config, which
|
||||||
--target "${{ matrix.gnu_target }}.2.28" --bin tsunagi-tray
|
# has no cross story under zig, so the Linux GUI is built natively
|
||||||
|
# (x86_64 only) against the runner's glibc.
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y --no-install-recommends \
|
||||||
|
libgtk-3-dev libayatana-appindicator3-dev
|
||||||
|
cargo build --release --locked \
|
||||||
|
--target "${{ matrix.gnu_target }}" --bin tsunagi-tray
|
||||||
|
else
|
||||||
|
echo "no GUI build for ${{ matrix.target }}"
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
cargo build --release --locked --target "${{ matrix.target }}" --bin tsunagi-tray
|
cargo build --release --locked --target "${{ matrix.target }}" --bin tsunagi-tray
|
||||||
fi
|
fi
|
||||||
@@ -133,11 +140,13 @@ jobs:
|
|||||||
[[ "${{ runner.os }}" == "Windows" ]] && bin="tsunagi.exe"
|
[[ "${{ runner.os }}" == "Windows" ]] && bin="tsunagi.exe"
|
||||||
cp "target/${{ matrix.target }}/release/${bin}" "$stage/"
|
cp "target/${{ matrix.target }}/release/${bin}" "$stage/"
|
||||||
|
|
||||||
# The tray GUI alongside it: glibc build on Linux, native elsewhere.
|
# The tray GUI alongside it, where it was built (Linux: x86_64 only).
|
||||||
tray="tsunagi-tray"
|
tray="tsunagi-tray"
|
||||||
[[ "${{ runner.os }}" == "Windows" ]] && tray="tsunagi-tray.exe"
|
[[ "${{ runner.os }}" == "Windows" ]] && tray="tsunagi-tray.exe"
|
||||||
if [[ "${{ runner.os }}" == "Linux" ]]; then
|
if [[ "${{ runner.os }}" == "Linux" ]]; then
|
||||||
cp "target/${{ matrix.gnu_target }}/release/${tray}" "$stage/"
|
if [[ -n "${{ matrix.gnu_target }}" ]]; then
|
||||||
|
cp "target/${{ matrix.gnu_target }}/release/${tray}" "$stage/"
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
cp "target/${{ matrix.target }}/release/${tray}" "$stage/"
|
cp "target/${{ matrix.target }}/release/${tray}" "$stage/"
|
||||||
fi
|
fi
|
||||||
@@ -201,7 +210,7 @@ jobs:
|
|||||||
# The GUI variants: the same agent plus the tray binary and a desktop
|
# The GUI variants: the same agent plus the tray binary and a desktop
|
||||||
# launcher, named tsunagi-gui (conflicting with the headless packages).
|
# launcher, named tsunagi-gui (conflicting with the headless packages).
|
||||||
- name: Build the GUI packages
|
- name: Build the GUI packages
|
||||||
if: matrix.deb
|
if: matrix.gnu_target
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|||||||
@@ -47,7 +47,6 @@ jobs:
|
|||||||
deb: true
|
deb: true
|
||||||
deb_arch: arm64
|
deb_arch: arm64
|
||||||
pkg_arch: aarch64
|
pkg_arch: aarch64
|
||||||
gnu_target: aarch64-unknown-linux-gnu
|
|
||||||
- os: macos-latest
|
- os: macos-latest
|
||||||
target: aarch64-apple-darwin
|
target: aarch64-apple-darwin
|
||||||
asset: tsunagi-macos-aarch64
|
asset: tsunagi-macos-aarch64
|
||||||
@@ -113,11 +112,19 @@ jobs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
export RUSTFLAGS="${RUSTFLAGS:-} -A linker_messages"
|
|
||||||
if [[ "${{ runner.os }}" == "Linux" ]]; then
|
if [[ "${{ runner.os }}" == "Linux" ]]; then
|
||||||
rustup target add "${{ matrix.gnu_target }}"
|
if [[ -n "${{ matrix.gnu_target }}" ]]; then
|
||||||
cargo zigbuild --release --locked \
|
# tray-icon links GTK and libappindicator through pkg-config, which
|
||||||
--target "${{ matrix.gnu_target }}.2.28" --bin tsunagi-tray
|
# has no cross story under zig, so the Linux GUI is built natively
|
||||||
|
# (x86_64 only) against the runner's glibc.
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y --no-install-recommends \
|
||||||
|
libgtk-3-dev libayatana-appindicator3-dev
|
||||||
|
cargo build --release --locked \
|
||||||
|
--target "${{ matrix.gnu_target }}" --bin tsunagi-tray
|
||||||
|
else
|
||||||
|
echo "no GUI build for ${{ matrix.target }}"
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
cargo build --release --locked --target "${{ matrix.target }}" --bin tsunagi-tray
|
cargo build --release --locked --target "${{ matrix.target }}" --bin tsunagi-tray
|
||||||
fi
|
fi
|
||||||
@@ -135,11 +142,13 @@ jobs:
|
|||||||
[[ "${{ runner.os }}" == "Windows" ]] && bin="tsunagi.exe"
|
[[ "${{ runner.os }}" == "Windows" ]] && bin="tsunagi.exe"
|
||||||
cp "target/${{ matrix.target }}/release/${bin}" "$stage/"
|
cp "target/${{ matrix.target }}/release/${bin}" "$stage/"
|
||||||
|
|
||||||
# The tray GUI alongside it: glibc build on Linux, native elsewhere.
|
# The tray GUI alongside it, where it was built (Linux: x86_64 only).
|
||||||
tray="tsunagi-tray"
|
tray="tsunagi-tray"
|
||||||
[[ "${{ runner.os }}" == "Windows" ]] && tray="tsunagi-tray.exe"
|
[[ "${{ runner.os }}" == "Windows" ]] && tray="tsunagi-tray.exe"
|
||||||
if [[ "${{ runner.os }}" == "Linux" ]]; then
|
if [[ "${{ runner.os }}" == "Linux" ]]; then
|
||||||
cp "target/${{ matrix.gnu_target }}/release/${tray}" "$stage/"
|
if [[ -n "${{ matrix.gnu_target }}" ]]; then
|
||||||
|
cp "target/${{ matrix.gnu_target }}/release/${tray}" "$stage/"
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
cp "target/${{ matrix.target }}/release/${tray}" "$stage/"
|
cp "target/${{ matrix.target }}/release/${tray}" "$stage/"
|
||||||
fi
|
fi
|
||||||
@@ -203,7 +212,7 @@ jobs:
|
|||||||
# The GUI variants: the same agent plus the tray binary and a desktop
|
# The GUI variants: the same agent plus the tray binary and a desktop
|
||||||
# launcher, named tsunagi-gui (conflicting with the headless packages).
|
# launcher, named tsunagi-gui (conflicting with the headless packages).
|
||||||
- name: Build the GUI packages
|
- name: Build the GUI packages
|
||||||
if: matrix.deb
|
if: matrix.gnu_target
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|||||||
Reference in new issue
Block a user