Skip to content

Commit 91500b7

Browse files
committed
ci: fix script_dir variable, by assigning it earlier in the scripts
1 parent b7c3003 commit 91500b7

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

platforms/build-3ds.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,13 @@ APP_ROMFS='$ROMFS'
156156
157157
EOF
158158

159+
# source dependency version information
160+
161+
SCRIPT_DIR="$(realpath "$(dirname -- "${BASH_SOURCE[0]}")")"
162+
163+
# shellcheck source=./platforms/versions.sh
164+
source "$SCRIPT_DIR/versions.sh"
165+
159166
## build sdl2 and libraries (ttf, mixer, image)
160167

161168
export SDL_TOP_BUILD_DIR="SDL2_local_build_3ds"
@@ -171,13 +178,6 @@ echo "*" >.gitignore
171178

172179
mkdir -p "$SDL_ROOT_DIR"
173180

174-
# source dependency version information
175-
176-
SCRIPT_DIR="$(realpath "$(dirname -- "$0")")"
177-
178-
# shellcheck source=./platforms/versions.sh
179-
source "$SCRIPT_DIR/versions.sh"
180-
181181
# build sdl2
182182

183183
export SDL2_SRC_DIR="SDL2-${SDL_3DS_VERSION}"

platforms/build-android.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,13 @@ else
112112
exit 1
113113
fi
114114

115+
# source dependency version information
116+
117+
SCRIPT_DIR="$(realpath "$(dirname -- "${BASH_SOURCE[0]}")")"
118+
119+
# shellcheck source=./platforms/versions.sh
120+
source "$SCRIPT_DIR/versions.sh"
121+
115122
for INDEX in "${ARCH_KEYS_INDEX[@]}"; do
116123
export KEY=${ARCH_KEYS[$INDEX]}
117124

@@ -182,13 +189,6 @@ for INDEX in "${ARCH_KEYS_INDEX[@]}"; do
182189
export LLVM_CONFIG="llvm-config"
183190
unset PKG_CONFIG
184191

185-
# source dependency version information
186-
187-
SCRIPT_DIR="$(realpath "$(dirname -- "$0")")"
188-
189-
# shellcheck source=./platforms/versions.sh
190-
source "$SCRIPT_DIR/versions.sh"
191-
192192
## BUILD dependencies not buildable with meson (to complicated to port)
193193

194194
## build mpg123 with cmake (meson port is to much work atm, for this feature)

0 commit comments

Comments
 (0)