Skip to content

Commit 5822f9a

Browse files
committed
Fixed CI
New release
1 parent 61a1736 commit 5822f9a

File tree

3 files changed

+5
-33
lines changed

3 files changed

+5
-33
lines changed

.github/workflows/ci.yaml

+1-29
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,10 @@ jobs:
2121
ARCH=$(uname -m)
2222
wget --quiet https://github.com/ldc-developers/ldc/releases/download/v${LDC_VERSION}/ldc2-${LDC_VERSION}-linux-${ARCH}.tar.xz
2323
tar xf ldc2-${LDC_VERSION}-linux-${ARCH}.tar.xz
24-
ls -ld
25-
ls -l
26-
ls -l ./BioD/contrib/msgpack-d/src
27-
ls -l BioD/contrib/msgpack-d/src
28-
pwd
2924
echo "ldc2-${LDC_VERSION}-linux-${ARCH}/bin" >> $GITHUB_PATH
3025
3126
- name: Build & test
32-
run: make -j2 check
33-
34-
- name: Create artifact
35-
run: |
36-
VERSION=$(cat VERSION)
37-
mkdir artifact
38-
gzip --stdout bin/sambamba-${VERSION} > artifact/sambamba-${VERSION}-linux-amd64-static.gz
39-
40-
- name: Upload artifact
41-
uses: actions/upload-artifact@v1
42-
with:
43-
name: sambamba-binary-archives
44-
path: artifact
45-
27+
run: make -j2 VERBOSE=1 check
4628

4729
build-aarch64:
4830
name: Build aarch64
@@ -72,13 +54,3 @@ jobs:
7254
source $HOME/.env
7355
cd /sambamba
7456
make -j2 check
75-
VERSION=$(cat VERSION)
76-
file bin/sambamba-${VERSION}
77-
mkdir artifact
78-
gzip --stdout bin/sambamba-${VERSION} > artifact/sambamba-${VERSION}-linux-arm64-static.gz
79-
80-
- name: Upload artifact
81-
uses: actions/upload-artifact@v1
82-
with:
83-
name: sambamba-binary-archives
84-
path: artifact

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,8 @@ LDFLAGS = -L=-flto=full
4646
# DLIBS = $(LIBRARY_PATH)/libphobos2-ldc.a $(LIBRARY_PATH)/libdruntime-ldc.a
4747
# DLIBS_DEBUG = $(LIBRARY_PATH)/libphobos2-ldc-debug.a $(LIBRARY_PATH)/libdruntime-ldc-debug.a
4848
# LIBS = -L-L$(LIBRARY_PATH) -L-lpthread -L-lm -L-lz -L-llz4
49-
# LIBS_STATIC = $(LIBRARY_PATH)/libc.a $(DLIBS) -L-llz4 -L-lz
49+
LIBS = -L-lz -L-llz4
5050
LIBS_STATIC = -L-lz -L-llz4 -L-L$(LIBRARY_PATH) -L-lphobos2-ldc -L-ldruntime-ldc
51-
# -L-lphobos2-ldc -L-ldruntime-ldc
5251
SRC = $(wildcard main.d utils/*.d thirdparty/*.d) $(wildcard BioD/contrib/undead/*.d BioD/contrib/undead/*/*.d) $(wildcard BioD/bio/*/*.d BioD/bio/*/*/*.d BioD/bio/*/*/*/*.d BioD/bio/*/*/*/*/*.d BioD/bio/*/*/*/*/*/*/*.d BioD/contrib/msgpack-d/src/msgpack/*.d) $(wildcard sambamba/*.d sambamba/*/*.d sambamba/*/*/*.d)
5352
OBJ = $(SRC:.d=.o)
5453
OUT = bin/sambamba-$(shell cat VERSION)
@@ -69,8 +68,9 @@ static: DFLAGS += -static -L-Bstatic -link-defaultlib
6968

7069
pgo-static: DFLAGS += -fprofile-instr-use=profile.data
7170

71+
# note use python3 for github CI:
7272
utils/ldc_version_info_.d:
73-
python ./gen_ldc_version_info.py $(shell which ldmd2) > utils/ldc_version_info_.d
73+
python3 ./gen_ldc_version_info.py $(shell which ldmd2) > utils/ldc_version_info_.d
7474
cat utils/ldc_version_info_.d
7575

7676
ldc_version_info: utils/ldc_version_info_.d

RELEASE-NOTES.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## ChangeLog v1.0.1 (20230815)
1+
## ChangeLog v1.0.1 (20230816)
22

33
+ Fixed the build for recent ldc2 compilers by using a recent msgpack
44
+ Ran benchmarks and optimized meson build

0 commit comments

Comments
 (0)