Skip to content

Commit f8745da

Browse files
authored
Merge pull request #4298 from facebook/dev
v1.5.7
2 parents 794ea1b + ea027ab commit f8745da

File tree

166 files changed

+6213
-3997
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+6213
-3997
lines changed

.circleci/config.yml

Lines changed: 0 additions & 123 deletions
This file was deleted.

.circleci/images/primary/Dockerfile

Lines changed: 0 additions & 9 deletions
This file was deleted.

.cirrus.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
task:
2-
name: FreeBSD (shortest)
2+
name: FreeBSD (make check)
33
freebsd_instance:
44
matrix:
5-
image_family: freebsd-14-0
6-
image_family: freebsd-13-2
5+
image_family: freebsd-14-2
76
install_script: pkg install -y gmake coreutils
87
script: |
98
MOREFLAGS="-Werror" gmake -j all
10-
gmake shortest
9+
gmake check
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Android NDK Build
2+
3+
on:
4+
pull_request:
5+
branches: [ dev, release, actionsTest ]
6+
push:
7+
branches: [ actionsTest, '*ndk*' ]
8+
9+
permissions: read-all
10+
11+
jobs:
12+
build:
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4.1.1
17+
18+
- name: Set up JDK 17
19+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
20+
with:
21+
java-version: '17'
22+
distribution: 'temurin'
23+
24+
- name: Setup Android SDK
25+
uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2
26+
27+
- name: Install Android NDK
28+
run: |
29+
sdkmanager --install "ndk;27.0.12077973"
30+
echo "ANDROID_NDK_HOME=$ANDROID_SDK_ROOT/ndk/27.0.12077973" >> $GITHUB_ENV
31+
32+
- name: Build with NDK
33+
run: |
34+
export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
35+
make CC=aarch64-linux-android21-clang \
36+
AR=llvm-ar \
37+
RANLIB=llvm-ranlib \
38+
STRIP=llvm-strip
39+

.github/workflows/commit.yml

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@ on:
33
push:
44
branches:
55
- dev
6+
pull_request:
7+
branches:
8+
- dev
9+
610
permissions: read-all
11+
712
jobs:
813
short-tests-0:
914
runs-on: ubuntu-latest
@@ -25,8 +30,9 @@ jobs:
2530
make c99build; make clean
2631
make c11build; make clean
2732
make -j regressiontest; make clean
28-
make shortest; make clean
33+
make check; make clean
2934
make cxxtest; make clean
35+
3036
short-tests-1:
3137
runs-on: ubuntu-latest
3238
services:
@@ -38,17 +44,26 @@ jobs:
3844
- name: Install Dependencies
3945
run: |
4046
sudo apt-get update
41-
sudo apt-get install gcc-powerpc-linux-gnu gcc-arm-linux-gnueabi gcc-aarch64-linux-gnu libc6-dev-ppc64-powerpc-cross libcurl4-gnutls-dev lib64gcc-11-dev-powerpc-cross
42-
- name: Test
43-
run: |-
44-
make gnu90build; make clean
45-
make gnu99build; make clean
46-
make ppc64build V=1; make clean
47-
make ppcbuild V=1; make clean
48-
make armbuild V=1; make clean
49-
make aarch64build V=1; make clean
50-
make -C tests test-legacy test-longmatch; make clean
51-
make -C lib libzstd-nomt; make clean
47+
sudo apt-get install gcc-powerpc-linux-gnu gcc-arm-linux-gnueabi gcc-aarch64-linux-gnu libc6-dev-ppc64-powerpc-cross libcurl4-gnutls-dev lib64gcc-13-dev-powerpc-cross
48+
- name: gnu90 build
49+
run: make gnu90build && make clean
50+
- name: gnu99 build
51+
run: make gnu99build && make clean
52+
- name: ppc64 build
53+
run: make ppc64build V=1 && make clean
54+
- name: ppc build
55+
run: make ppcbuild V=1 && make clean
56+
- name: arm build
57+
run: make armbuild V=1 && make clean
58+
- name: aarch64 build
59+
run: make aarch64build V=1 && make clean
60+
- name: test-legacy
61+
run: make -C tests test-legacy V=1 && make clean
62+
- name: test-longmatch
63+
run: make -C tests test-longmatch V=1 && make clean
64+
- name: libzstd-nomt build
65+
run: make -C lib libzstd-nomt V=1 && make clean
66+
5267
regression-test:
5368
runs-on: ubuntu-latest
5469
services:

0 commit comments

Comments
 (0)