Skip to content

Commit c62266e

Browse files
committed
Flip if statement so that it matches execution order
1 parent 7f9516e commit c62266e

2 files changed

Lines changed: 18 additions & 16 deletions

File tree

sources/OpenAL/Soft.Native/build-linux-arm.sh

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,15 @@
22

33
# Dependencies
44
if [[ ! -z ${GITHUB_ACTIONS+x} ]]; then
5-
if [[ ! -z ${SILKDOTNET_DockerBuild+x} ]]; then
5+
if [[ -z ${SILKDOTNET_DockerBuild+x} ]]; then
6+
# Enter Debian container for multiarch packages
7+
docker="docker"
8+
if command -v podman >/dev/null 2>&1; then
9+
docker="podman"
10+
fi
11+
$docker run --platform linux/amd64 -e SILKDOTNET_DockerBuild=1 -e GITHUB_ACTIONS=1 -v $(readlink -f ../../../):/data debian bash -c "cd /data/sources/OpenAL/Soft.Native && ./build-linux-arm.sh"
12+
exit
13+
else
614
dpkg --add-architecture armhf
715
apt update
816
apt install -y \
@@ -11,13 +19,6 @@ if [[ ! -z ${GITHUB_ACTIONS+x} ]]; then
1119
libmysofa-dev:armhf qtbase5-dev:armhf libdbus-1-dev:armhf libjack-dev:armhf portaudio19-dev:armhf \
1220
libpipewire-0.3-dev:armhf qt6-base-dev:armhf pulseaudio:armhf \
1321
gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf
14-
else
15-
docker="docker"
16-
if command -v podman >/dev/null 2>&1; then
17-
docker="podman"
18-
fi
19-
$docker run --platform linux/amd64 -e SILKDOTNET_DockerBuild=1 -e GITHUB_ACTIONS=1 -v $(readlink -f ../../../):/data debian bash -c "cd /data/sources/OpenAL/Soft.Native && ./build-linux-arm.sh"
20-
exit
2122
fi
2223
fi
2324

sources/OpenAL/Soft.Native/build-linux-arm64.sh

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,15 @@
22

33
# Dependencies
44
if [[ ! -z ${GITHUB_ACTIONS+x} ]]; then
5-
if [[ ! -z ${SILKDOTNET_DockerBuild+x} ]]; then
5+
if [[ -z ${SILKDOTNET_DockerBuild+x} ]]; then
6+
# Enter Debian container for multiarch packages
7+
docker="docker"
8+
if command -v podman >/dev/null 2>&1; then
9+
docker="podman"
10+
fi
11+
$docker run --platform linux/amd64 -e SILKDOTNET_DockerBuild=1 -e GITHUB_ACTIONS=1 -v $(readlink -f ../../../):/data debian bash -c "cd /data/sources/OpenAL/Soft.Native && ./build-linux-arm64.sh"
12+
exit
13+
else
614
dpkg --add-architecture arm64
715
apt update
816
apt install -y \
@@ -11,13 +19,6 @@ if [[ ! -z ${GITHUB_ACTIONS+x} ]]; then
1119
libmysofa-dev:arm64 qtbase5-dev:arm64 libdbus-1-dev:arm64 libjack-dev:arm64 portaudio19-dev:arm64 \
1220
libpipewire-0.3-dev:arm64 qt6-base-dev:arm64 pulseaudio:arm64 \
1321
gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
14-
else
15-
docker="docker"
16-
if command -v podman >/dev/null 2>&1; then
17-
docker="podman"
18-
fi
19-
$docker run --platform linux/amd64 -e SILKDOTNET_DockerBuild=1 -e GITHUB_ACTIONS=1 -v $(readlink -f ../../../):/data debian bash -c "cd /data/sources/OpenAL/Soft.Native && ./build-linux-arm64.sh"
20-
exit
2122
fi
2223
fi
2324

0 commit comments

Comments
 (0)