Skip to content

Commit

Permalink
Fixed CI
Browse files Browse the repository at this point in the history
New release
  • Loading branch information
pjotrp committed Aug 16, 2023
1 parent 61a1736 commit 5822f9a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 33 deletions.
30 changes: 1 addition & 29 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,10 @@ jobs:
ARCH=$(uname -m)
wget --quiet https://github.com/ldc-developers/ldc/releases/download/v${LDC_VERSION}/ldc2-${LDC_VERSION}-linux-${ARCH}.tar.xz
tar xf ldc2-${LDC_VERSION}-linux-${ARCH}.tar.xz
ls -ld
ls -l
ls -l ./BioD/contrib/msgpack-d/src
ls -l BioD/contrib/msgpack-d/src
pwd
echo "ldc2-${LDC_VERSION}-linux-${ARCH}/bin" >> $GITHUB_PATH
- name: Build & test
run: make -j2 check

- name: Create artifact
run: |
VERSION=$(cat VERSION)
mkdir artifact
gzip --stdout bin/sambamba-${VERSION} > artifact/sambamba-${VERSION}-linux-amd64-static.gz
- name: Upload artifact
uses: actions/upload-artifact@v1
with:
name: sambamba-binary-archives
path: artifact

run: make -j2 VERBOSE=1 check

build-aarch64:
name: Build aarch64
Expand Down Expand Up @@ -72,13 +54,3 @@ jobs:
source $HOME/.env
cd /sambamba
make -j2 check
VERSION=$(cat VERSION)
file bin/sambamba-${VERSION}
mkdir artifact
gzip --stdout bin/sambamba-${VERSION} > artifact/sambamba-${VERSION}-linux-arm64-static.gz
- name: Upload artifact
uses: actions/upload-artifact@v1
with:
name: sambamba-binary-archives
path: artifact
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,8 @@ LDFLAGS = -L=-flto=full
# DLIBS = $(LIBRARY_PATH)/libphobos2-ldc.a $(LIBRARY_PATH)/libdruntime-ldc.a
# DLIBS_DEBUG = $(LIBRARY_PATH)/libphobos2-ldc-debug.a $(LIBRARY_PATH)/libdruntime-ldc-debug.a
# LIBS = -L-L$(LIBRARY_PATH) -L-lpthread -L-lm -L-lz -L-llz4
# LIBS_STATIC = $(LIBRARY_PATH)/libc.a $(DLIBS) -L-llz4 -L-lz
LIBS = -L-lz -L-llz4
LIBS_STATIC = -L-lz -L-llz4 -L-L$(LIBRARY_PATH) -L-lphobos2-ldc -L-ldruntime-ldc
# -L-lphobos2-ldc -L-ldruntime-ldc
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)
OBJ = $(SRC:.d=.o)
OUT = bin/sambamba-$(shell cat VERSION)
Expand All @@ -69,8 +68,9 @@ static: DFLAGS += -static -L-Bstatic -link-defaultlib

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

# note use python3 for github CI:
utils/ldc_version_info_.d:
python ./gen_ldc_version_info.py $(shell which ldmd2) > utils/ldc_version_info_.d
python3 ./gen_ldc_version_info.py $(shell which ldmd2) > utils/ldc_version_info_.d
cat utils/ldc_version_info_.d

ldc_version_info: utils/ldc_version_info_.d
Expand Down
2 changes: 1 addition & 1 deletion RELEASE-NOTES.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## ChangeLog v1.0.1 (20230815)
## ChangeLog v1.0.1 (20230816)

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

0 comments on commit 5822f9a

Please sign in to comment.