Skip to content

Commit 60f05a2

Browse files
authored
Merge pull request #898 from lmorg/develop
updated version number
2 parents 4069702 + 66de2f4 commit 60f05a2

File tree

3 files changed

+46
-44
lines changed

3 files changed

+46
-44
lines changed

.github/workflows/murex-downloads.yaml

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -51,23 +51,19 @@ jobs:
5151
mkdir -p website-cache
5252
5353
export MUREXVERSION="$(./murex -c 'version --no-app-name')"
54-
OLDVER="$(curl -s https://nojs.murex.rocks/VERSION | head -n1)"
54+
#OLDVER="$(curl -s https://nojs.murex.rocks/VERSION | head -n1)"
5555
56-
#if [ "$MUREXVERSION" == "$OLDVER" ]; then
57-
# echo "No version change, skipping binary build."
58-
#else
59-
echo "Building latest binaries...."
60-
./murex ./test/build_all_platforms.mx --inc-latest --compress
61-
mv -v ./bin ./website-cache
62-
63-
echo "Compiling WebAssembly...."
64-
export GOOS=js
65-
export GOARCH=wasm
66-
export LD_FLAGS="-extldflags=-static"
67-
export tags="$(cat builtins/optional/standard-opts.txt),sqlite_omit_load_extension,osusergo,netgo"
68-
go build -ldflags "$LD_FLAGS" -tags "$tags" -o ./gen/website/wasm/murex.wasm
69-
cp -v "$(go env GOROOT)/misc/wasm/wasm_exec.js" ./gen/website/wasm/
70-
#fi
56+
echo "Building latest binaries...."
57+
./murex ./test/build_all_platforms.mx --inc-latest --compress
58+
mv -v ./bin ./website-cache
59+
60+
echo "Compiling WebAssembly...."
61+
export GOOS=js
62+
export GOARCH=wasm
63+
export LD_FLAGS="-extldflags=-static"
64+
export tags="$(cat builtins/optional/standard-opts.txt),sqlite_omit_load_extension,osusergo,netgo"
65+
go build -ldflags "$LD_FLAGS" -tags "$tags" -o ./gen/website/wasm/murex.wasm
66+
cp -v "$(go env GOROOT)/misc/wasm/wasm_exec.js" ./gen/website/wasm/
7167

7268
- name: Build Website
7369
run: |
@@ -76,42 +72,48 @@ jobs:
7672
export MUREXCOMMITL="$(git rev-parse HEAD)"
7773
export MUREXTESTS="$(cat ./test/murex-test-count.txt)"
7874
79-
sed -i "s/\$DATE/`date`/g;
80-
s/\$COMMITHASHSHORT/$MUREXCOMMITS/g;
81-
s/\$COMMITHASHLONG/$MUREXCOMMITL/g;
82-
s/\$MUREXVERSION/$MUREXVERSION/g;
83-
s/\$MUREXTESTS/$MUREXTESTS/g" \
84-
gen/website/header.html
75+
sed -i "
76+
s/\$DATE/`date`/g;
77+
s/\$COMMITHASHSHORT/$MUREXCOMMITS/g;
78+
s/\$COMMITHASHLONG/$MUREXCOMMITL/g;
79+
s/\$MUREXVERSION/$MUREXVERSION/g;
80+
s/\$MUREXTESTS/$MUREXTESTS/g" \
81+
gen/website/header.html
8582
86-
sed -i "s/\$DATE/`date`/;
87-
s/\$COMMITHASHSHORT/$MUREXCOMMITS/g;
88-
s/\$COMMITHASHLONG/$MUREXCOMMITL/g;
89-
s/\$MUREXVERSION/$MUREXVERSION/g;
90-
s/\$MUREXTESTS/$MUREXTESTS/g" \
91-
gen/website/footer.html
83+
sed -i "
84+
s/\$DATE/`date`/;
85+
s/\$COMMITHASHSHORT/$MUREXCOMMITS/g;
86+
s/\$COMMITHASHLONG/$MUREXCOMMITL/g;
87+
s/\$MUREXVERSION/$MUREXVERSION/g;
88+
s/\$MUREXTESTS/$MUREXTESTS/g" \
89+
gen/website/footer.html
9290

9391
cp gen/website/404.md .
9492
for f in *.md; do
95-
./murex gen/website/find-exec.mx $f
93+
./murex gen/website/find-exec.mx $f
9694
done
9795
find docs -name "*.md" -exec ./murex gen/website/find-exec.mx {} \;
9896

99-
sed -i '0,/<img src/s//<img class="no-border" src/;
100-
0,/<img src/s//<img class="no-border" src/;
101-
0,/<img src/s//<img class="no-border" src/;' \
102-
README.html
97+
sed -i '
98+
0,/<img src/s//<img class="no-border" src/;
99+
0,/<img src/s//<img class="no-border" src/;
100+
0,/<img src/s//<img class="no-border" src/;
101+
0,/<img src/s//<img class="no-border" src/;' \
102+
README.html
103103

104-
sed -i '0,/<img src/s//<img class="no-border" src/;
105-
0,/<img src/s//<img class="no-border" src/;
106-
0,/<img src/s//<img class="no-border" src/;
107-
0,/<img src/s//<img class="no-border" src/;' \
108-
INSTALL.html
104+
sed -i '
105+
0,/<img src/s//<img class="no-border" src/;
106+
0,/<img src/s//<img class="no-border" src/;
107+
0,/<img src/s//<img class="no-border" src/;
108+
0,/<img src/s//<img class="no-border" src/;' \
109+
INSTALL.html
109110

110-
sed -i '0,/<img src/s//<img class="no-border" src/;' \
111-
DOWNLOAD.html
111+
sed -i '
112+
0,/<img src/s//<img class="no-border" src/;' \
113+
DOWNLOAD.html
112114

113115
sed -i 's.\\|.|.g;' \
114-
docs/user-guide/rosetta-stone.html
116+
docs/user-guide/rosetta-stone.html
115117

116118
echo "$MUREXVERSION" > VERSION
117119

app/app.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ const Name = "murex"
1616
const (
1717
Major = 6
1818
Minor = 4
19-
Revision = 102
19+
Revision = 1005
2020
Branch = "develop"
21-
BuildDate = "2024-12-10 22:21:56"
21+
BuildDate = "2024-12-10 22:48:33"
2222
)
2323

2424
// Copyright is the copyright owner string

version.svg

Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)