Skip to content

Commit 77ff2fa

Browse files
committed
Try native builds
1 parent 004d87f commit 77ff2fa

5 files changed

Lines changed: 15 additions & 37 deletions

File tree

.github/workflows/build.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ on:
55
pull_request:
66

77
env:
8-
sfall_version: 4.4.5.1
9-
mpack_version: 4.4.5
8+
sfall_version: 4.4.7
9+
mpack_version: 4.4.7
10+
sslc_url: https://github.com/sfall-team/sslc/releases/download/2025-06-18-01-40-04/sslc-linux
11+
dat3_url: https://github.com/BGforgeNet/dat3/releases/download/v0.1.0/dat3
1012

1113
jobs:
1214
build:
@@ -19,11 +21,8 @@ jobs:
1921
- name: ShellCheck
2022
uses: ludeeus/action-shellcheck@master
2123

22-
- name: Install wine
23-
uses: devopsx/gha-ubuntu-i386-fix@master
24-
2524
- name: Install packages
26-
run: sudo DEBIAN_FRONTEND=noninteractive eatmydata apt-get install -o=Dpkg::Use-Pty=0 -y p7zip
25+
run: sudo DEBIAN_FRONTEND=noninteractive apt-get install -o=Dpkg::Use-Pty=0 -y p7zip
2726

2827
- name: Build and package
2928
run: |

extra/buildall.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -xeu -o pipefail
55
extra_dir="${extra_dir:-extra}"
66
extra_dir="$(realpath "$extra_dir")"
77
bin_dir="$extra_dir/bin"
8-
compile="$bin_dir/compile.exe"
8+
compile="$bin_dir/sslc"
99
dst="data/scripts"
1010
mkdir -p "$dst"
1111
dst="$(realpath $dst)"
@@ -50,5 +50,5 @@ mkdir -p "$dst"
5050
cd source
5151
for f in $(ls | grep "\.ssl$"); do
5252
int_name="$(echo "$f" | sed 's|\.ssl$|.int|')"
53-
wine "$compile" -l -O2 -p -s -q -n "$f" -o "$dst/$int_name"
53+
"$compile" -l -O2 -p -s -q -n "$f" -o "$dst/$int_name"
5454
done

extra/env.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@ extra_dir="$(realpath extra)"
66
export extra_dir
77
export bin_dir="$extra_dir/bin"
88
export mods_dir="mods"
9-
export mpack_version=${mpack_version:-4.3}
10-
export mpack_7z="mpack.7z"
11-
export sfall_version=${sfall_version:-4.3}
129
export WINEARCH=win32
1310
export WINEDEBUG=-all
1411
export mod_name=fo2tweaks
12+
export compile="$bin_dir/sslc"
1513

1614
set +xeu +o pipefail
1715

extra/package.sh

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

33
set -xeu -o pipefail
44

5-
export comp_dir="components"
65
# shellcheck disable=2154 # from env.sh
7-
export dat2="wine $bin_dir/dat2.exe"
8-
export dat2a="wine $bin_dir/dat2.exe a -1"
9-
export file_list="file.list"
6+
dat3=$bin_dir/dat3
107

118
short_sha="$(git rev-parse --short HEAD)"
129
# defaults, local build or github non-tagged
@@ -28,9 +25,7 @@ mkdir -p "$mods_dir"
2825

2926
cd data
3027
rm -rf text/po # gettext translations
31-
# I don't know how to pack recursively
32-
find . -type f | sed -e 's|^\.\/||' -e 's|\/|\\|g' | sort >../file.list # replace slashes with backslashes
33-
wine "$bin_dir/dat2.exe" a "$dat" @../file.list
28+
$dat3 a "$dat" ./*
3429
cd ..
3530
mv "data/$dat" "$mods_dir/"
3631

extra/prepare.sh

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,8 @@
22

33
set -xeu -o pipefail
44

5-
extra_dir=${extra_dir:-extra}
6-
mpack_version=${mpack_version:-4.3}
7-
8-
mpack_file="modderspack_$mpack_version.7z"
9-
mpack_url="https://sourceforge.net/projects/sfall/files/Modders%20pack/$mpack_file/download"
10-
compile_exe="compile.exe"
11-
mpack_compile="ScriptEditor/resources/$compile_exe"
12-
13-
# directories
14-
cache_dir="$HOME/.cache/build"
15-
bin_dir="$(realpath extra/bin)"
16-
mkdir -p "$cache_dir" "$bin_dir"
17-
18-
# compile.exe, check cache
19-
wget -q "$mpack_url" -O mpack.7z
20-
7zr e mpack.7z "$mpack_compile"
21-
mv -f "$compile_exe" "$cache_dir/"
22-
# copy
23-
cp -f "$cache_dir/$compile_exe" "$bin_dir/"
5+
# from env.sh
6+
# shellcheck disable=2154
7+
wget -q "$sslc_url" -O "$compile"
8+
# shellcheck disable=2154
9+
wget -q "$dat3_url" -O "$dat3"

0 commit comments

Comments
 (0)