From 9f88c1ce66c574547337ebda34c1c67a45f7c436 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Sun, 14 Jan 2018 18:01:25 +0300 Subject: [PATCH 1/4] Add Fedora Rawhide and Debian Sid to CI/build/packaging matrices. --- .travis.yml | 13 +++++++++++++ scripts/buildpack.sh | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/.travis.yml b/.travis.yml index 89d8931..9b2c13c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,7 @@ env: - OS=el DIST=7 - OS=fedora DIST=26 - OS=fedora DIST=27 + - OS=fedora DIST=rawhide - OS=ubuntu DIST=trusty - OS=ubuntu DIST=xenial - OS=ubuntu DIST=zesty @@ -39,6 +40,7 @@ env: - OS=debian DIST=wheezy - OS=debian DIST=jessie - OS=debian DIST=stretch + - OS=debian DIST=sid - OS=ubuntu DIST=trusty ARCH=i386 - OS=ubuntu DIST=xenial ARCH=i386 - OS=ubuntu DIST=zesty ARCH=i386 @@ -46,6 +48,7 @@ env: - OS=debian DIST=wheezy ARCH=i386 - OS=debian DIST=jessie ARCH=i386 - OS=debian DIST=stretch ARCH=i386 + - OS=debian DISST=sid ARCH=i386 matrix: exclude: @@ -57,6 +60,8 @@ matrix: compiler: clang - env: OS=fedora DIST=27 compiler: clang + - env: OS=fedora DIST=rawhide + compiler: clang - env: OS=ubuntu DIST=trusty compiler: clang - env: OS=ubuntu DIST=xenial @@ -71,6 +76,8 @@ matrix: compiler: clang - env: OS=debian DIST=stretch compiler: clang + - env: OS=debian DIST=sid + compiler: clang - env: OS=ubuntu DIST=trusty ARCH=i386 compiler: clang - env: OS=ubuntu DIST=xenial ARCH=i386 @@ -85,6 +92,8 @@ matrix: compiler: clang - env: OS=debian DIST=stretch ARCH=i386 compiler: clang + - env: OS=debian DIST=sid ARCH=i386 + compiler: clang - env: OS=el DIST=6 os: osx - env: OS=el DIST=7 @@ -93,6 +102,8 @@ matrix: os: osx - env: OS=fedora DIST=27 os: osx + - env: OS=fedora DIST=rawhide + os: osx - env: OS=ubuntu DIST=trusty os: osx - env: OS=ubuntu DIST=xenial @@ -107,6 +118,8 @@ matrix: os: osx - env: OS=debian DIST=stretch os: osx + - env: OS=debian DIST=sid + os: osx - env: TARGET=distcheck compiler: clang - env: TARGET=distcheck diff --git a/scripts/buildpack.sh b/scripts/buildpack.sh index a09ca8d..506f13f 100755 --- a/scripts/buildpack.sh +++ b/scripts/buildpack.sh @@ -51,6 +51,7 @@ distros_x86_64=( "el 7 x86_64" "fedora 26 x86_64" "fedora 27 x86_64" + "fedora rawhide" "ubuntu trusty x86_64" "ubuntu xenial x86_64" "ubuntu zesty x86_64" @@ -58,6 +59,7 @@ distros_x86_64=( "debian wheezy x86_64" "debian jessie x86_64" "debian stretch x86_64" + "debian sid x86_64" ) distros_i386=( @@ -68,17 +70,20 @@ distros_i386=( "debian wheezy i386" "debian jessie i386" "debian stretch i386" + "debian sid i386" ) distros_aarch64=( "el 7 aarch64" "fedora 26 aarch64" "fedora 27 aarch64" + "fedora rawhide" "ubuntu artful aarch64" "ubuntu trusty aarch64" "ubuntu xenial aarch64" "debian jessie aarch64" "debian stretch aarch64" + "debian sid aarch64" ) main() From c1b2759b0fc950fa1a65a64766b6114ae79ad7e9 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Sun, 14 Jan 2018 18:31:14 +0300 Subject: [PATCH 2/4] Don't push packages to packagecloud for Fedora Rawhide and Debian Sid. Because of missing support in packagecloud repos. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9b2c13c..e9a3633 100644 --- a/.travis.yml +++ b/.travis.yml @@ -242,7 +242,7 @@ deploy: skip_cleanup: true on: all_branches: true - condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}" + condition: -n "$OS" && -n "$DIST" && -n "$PACKAGECLOUD_TOKEN" && "$DIST" != "rawhide" && "$DIST" != "sid" after_success: - > From dae005971afd33e63f7d65305f8d1c24c3cb82c2 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Sun, 14 Jan 2018 18:33:16 +0300 Subject: [PATCH 3/4] Exclude Fedora Rawhide and Debian Sid from default build/packaging matrices. Because of missing support in packagecloud repos. --- scripts/buildpack.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/buildpack.sh b/scripts/buildpack.sh index 506f13f..a09ca8d 100755 --- a/scripts/buildpack.sh +++ b/scripts/buildpack.sh @@ -51,7 +51,6 @@ distros_x86_64=( "el 7 x86_64" "fedora 26 x86_64" "fedora 27 x86_64" - "fedora rawhide" "ubuntu trusty x86_64" "ubuntu xenial x86_64" "ubuntu zesty x86_64" @@ -59,7 +58,6 @@ distros_x86_64=( "debian wheezy x86_64" "debian jessie x86_64" "debian stretch x86_64" - "debian sid x86_64" ) distros_i386=( @@ -70,20 +68,17 @@ distros_i386=( "debian wheezy i386" "debian jessie i386" "debian stretch i386" - "debian sid i386" ) distros_aarch64=( "el 7 aarch64" "fedora 26 aarch64" "fedora 27 aarch64" - "fedora rawhide" "ubuntu artful aarch64" "ubuntu trusty aarch64" "ubuntu xenial aarch64" "debian jessie aarch64" "debian stretch aarch64" - "debian sid aarch64" ) main() From b0beea01e8e41fe4a0633704d9038b58418ca093 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Sun, 14 Jan 2018 18:42:53 +0300 Subject: [PATCH 4/4] Backport a compiler warning fix from LuaJIT HEAD. --- third_party/luajit/luajit/src/lj_asm_arm64.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/luajit/luajit/src/lj_asm_arm64.h b/third_party/luajit/luajit/src/lj_asm_arm64.h index 328e4d7..66e926c 100644 --- a/third_party/luajit/luajit/src/lj_asm_arm64.h +++ b/third_party/luajit/luajit/src/lj_asm_arm64.h @@ -1082,7 +1082,7 @@ static void asm_ahustore(ASMState *as, IRIns *ir) src = ra_alloc1(as, ir->op2, allow); rset_clear(allow, src); if (irt_isinteger(ir->t)) - type = ra_allock(as, (int64_t)LJ_TISNUM << 47, allow); + type = ra_allock(as, (uint64_t)(int32_t)LJ_TISNUM << 47, allow); else type = ra_allock(as, irt_toitype(ir->t), allow); } else {