Update release to use binaries produced by buildx

Author: donhardman

.github/workflows/release.yml

@@ -1,24 +1,23 @@
-FROM ubuntu:22.04
+FROM alpine:3.17
 ARG BUILD_DEV=0
-ARG REV=main
 
 # Install the manticore-executor binary
-RUN apt-get update -y && apt-get install -y sudo git && \
-  git clone https://github.com/manticoresoftware/executor.git && \
-  cd executor && git checkout $REV && \
-  ./build-linux 8.1.13 0 $BUILD_DEV && \
+COPY . /src
+RUN apk add bash && \
+  cd /src && \
+  ./build-alpine 8.1.13 0 $BUILD_DEV && \
   mv build/dist/bin/php /usr/bin/manticore-executor && \
   ln -s /usr/bin/manticore-executor /usr/bin/php && \
-  cd .. && rm -fr executor
+  cd ../..
 
 # Add composer
 RUN test "$BUILD_DEV" -eq 1 && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
   php -r "if (hash_file('sha384', 'composer-setup.php') === '55ce33d7678c5a611085589f1f3ddf8b3c52d662cd01d4ba75c0ee0459970c2200a51f492d557530c71c15d8dba01eae') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" && \
   php composer-setup.php && \
   php -r "unlink('composer-setup.php');" && \
-  sudo mv composer.phar /usr/local/bin/composer
+  sudo mv composer.phar /usr/bin/composer || true
 
 WORKDIR /src
 
 # Build on silicon chip mac:
-#  docker buildx build --build-arg BUILD_DEV=1 --build-arg REV=v0.4.1 --platform linux/amd64 -t manticoresearch/manticore-executor:0.4.1 --push .
+#  docker buildx build --build-arg BUILD_DEV=1 --platform linux/amd64,linux/arm64 -t manticoresearch/manticore-executor:0.5.1-dev --push .

Dockerfile

@@ -1,13 +1,6 @@
 #!/usr/bin/env bash
-# Copyright (c) 2022, Manticore Software LTD (https://manticoresearch.com)
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the The PHP License, version 3.01. You should have
-# received a copy of the license along with this program; if you did not, 
-# you can find it at https://www.php.net/license/3_01.txt
-
 # That file here is for reference; actually used the one stored on the host to avoid checkout of the whole code
-set -e
+
 copy_to() {
   echo -e "Copy $1 to /mnt/repo_storage/manticoresearch_$2";
   cp "$1" "/mnt/repo_storage/manticoresearch_$2" && echo -e "Success"

bin/upload_repo_arc

@@ -1,13 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (c) 2022, Manticore Software LTD (https://manticoresearch.com)
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the The PHP License, version 3.01. You should have
-# received a copy of the license along with this program; if you did not, 
-# you can find it at https://www.php.net/license/3_01.txt
-
-
-# from outside: $DISTRO = stretch,buster,xenial,bionic,focal,jammy,bullseye
+# from outside: $DISTRO = stretch,buster,xenial,bionic,focal,jammy,bullseye,bookworm
 # That file here is for reference; actually used the one stored on the host to avoid checkout of the whole code
 set -e
 echo "Uploading $DISTRO"
@@ -26,6 +18,7 @@ copy_to() {
 for f in build/*deb; do
   # VER="$(echo "$f" | cut -d_ -f2)"
   ARCH=$(echo "$f" | cut -d_ -f3 | cut -d. -f1)
+  echo "Arch: $ARCH"
   if [ -f "$f" ]; then
     if [ -z "${IS_RELEASE_DIGIT}" ]; then
       IS_RELEASE_DIGIT=$(echo "$f" | cut -d. -f3 | cut -d- -f1)
@@ -45,17 +38,22 @@ for f in build/*deb; do
       copy_to "$f" "$DISTRO/main/binary-arm64/"
       # bundlearm=1
     fi
+
+    if [[ $ARCH == "all" ]]; then
+      copy_to "$f" "$DISTRO/main/binary-amd64/"
+      copy_to "$f" "$DISTRO/main/binary-arm64/"
+    fi
   fi
 done
 
 # no need to make bundle as we deploy one single package
 
 if [ -n "$SUFFIX" ]; then
   /usr/bin/docker exec repo-generator /generator.sh -distro "$DISTRO" -architecture amd -dev 1
-  /usr/bin/docker exec repo-generator /generator.sh -distro "$DISTRO" -architecture arm -dev 1
+  # /usr/bin/docker exec repo-generator /generator.sh -distro "$DISTRO" -architecture arm -dev 1
 else
   /usr/bin/docker exec repo-generator /generator.sh -distro "$DISTRO" -architecture amd
-  /usr/bin/docker exec repo-generator /generator.sh -distro "$DISTRO" -architecture arm
+  # /usr/bin/docker exec repo-generator /generator.sh -distro "$DISTRO" -architecture arm
 fi
 
 rm -rf build/*deb

bin/upload_repo_deb

@@ -1,14 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (c) 2022, Manticore Software LTD (https://manticoresearch.com)
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the The PHP License, version 3.01. You should have
-# received a copy of the license along with this program; if you did not, 
-# you can find it at https://www.php.net/license/3_01.txt
-
-
-# from outside: $DISTRO = 7,8,9
-
+# from outside: $DISTRO = 7,8
 # That file here is for reference; actually used the one stored on the host to avoid checkout of the whole code
 set -e
 echo "Uploading $DISTRO"
@@ -24,15 +15,19 @@ copy_to() {
 # bundleaarch=0
 # bundleintel=0
 
-for f in build/*."el$DISTRO".{x86_64,aarch64}.rpm; do
+for f in build/*."el$DISTRO".{x86_64,aarch64,noarch}.rpm; do
+
   echo "file $f"
   tail=$(echo "$f" | sed 's_build/__g;s/[a-z]*-//g;')
   # VER=$(echo "$tail" | cut -d. -f1,2,3,4,5)
   if [[ $tail == *".x86_64."* ]]; then
     ARCH=x86_64
   elif [[ $tail == *".aarch64."* ]]; then
     ARCH=aarch64
-  fi;
+  elif [[ $tail == *".noarch."* ]]; then
+    ARCH=noarch
+  fi
+  echo "Arch: $ARCH"
   if [ -f "$f" ]; then
     if [ -z "${IS_RELEASE_DIGIT}" ]; then
       IS_RELEASE_DIGIT=$(echo "$f" | cut -d. -f3 | cut -d_ -f1)
@@ -43,6 +38,7 @@ for f in build/*."el$DISTRO".{x86_64,aarch64}.rpm; do
       fi
     fi
 
+
     FILENAME=$(basename "$f")
     cp $f /work/repomanager/docker/rpm_signer/data/$DISTRO/$ARCH/$FILENAME
     /usr/bin/docker exec rpm_signer /worker.sh $DISTRO $ARCH
@@ -58,6 +54,11 @@ for f in build/*."el$DISTRO".{x86_64,aarch64}.rpm; do
       # bundleaarch=1
     fi
 
+    if [[ $ARCH == "noarch" ]]; then
+      copy_to "$f" x86_64/
+      copy_to "$f" aarch64/
+    fi
+
   fi
 done
 

bin/upload_repo_rpm

@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+# Copyright (c) 2022, Manticore Software LTD (https://manticoresearch.com)
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the The PHP License, version 3.01. You should have
+# received a copy of the license along with this program; if you did not,
+# you can find it at https://www.php.net/license/3_01.txt
+
+set -e
+install_deps() {
+  arch=$(arch)
+  # Do basic configuration of the system, and install build tools
+  apk update && \
+    apk add binutils cmake make libgcc musl-dev gcc g++ perl linux-headers && \
+    ln -s "/usr/bin/${arch}-alpine-linux-musl-gcc-ar" "/usr/bin/${arch}-alpine-linux-musl-ar" && \
+    ln -s "/usr/bin/${arch}-alpine-linux-musl-gcc-ranlib" "/usr/bin/${arch}-alpine-linux-musl-ranlib" && \
+    ln -s "/usr/bin/${arch}-alpine-linux-musl-gcc-nm" "/usr/bin/${arch}-alpine-linux-musl-nm" && \
+    ln -s /usr/bin/strip "/usr/bin/${arch}-alpine-linux-musl-strip" && \
+    ln -s /usr/bin/objcopy "/usr/bin/${arch}-alpine-linux-musl-objcopy"
+  export CROSS_COMPILE="/usr/bin/${arch}-alpine-linux-musl-"
+
+  apk add curl git autoconf bison re2c pkgconf zlib-dev zstd-dev openssl-libs-static openssl-dev zlib-static zlib-dev
+}
+
+install_dev_deps() {
+  apk add oniguruma-dev gmp-dev
+
+  test -d libzip-1.9.2 && rm -f $_
+  curl -sSL https://github.com/nih-at/libzip/releases/download/v1.9.2/libzip-1.9.2.tar.gz | tar -xzf -
+  cd libzip-1.9.2 && mkdir -p build && cd build
+  cmake -DBUILD_SHARED_LIBS=OFF -DENABLE_LZMA=OFF -DENABLE_BZIP2=OFF ..
+  make -j4 && make install
+  cd ../..
+  rm -fr libzip-1.9.2
+
+  test -d libxml2-2.10.3 && rm -f libxml2-2.10.3
+  curl -sSL https://github.com/GNOME/libxml2/archive/refs/tags/v2.10.3.tar.gz | tar -xzf -
+  cd libxml2-2.10.3 && mkdir -p build && cd build
+  cmake -DBUILD_SHARED_LIBS=OFF -DLIBXML2_WITH_LZMA=OFF -DLIBXML2_WITH_PYTHON=OFF -DLIBXML2_WITH_ICONV=OFF -DCMAKE_BUILD_TYPE=Release ..
+  make -j4 && make install
+  cd ../..
+  rm -fr libxml2-2.10.3
+}
+
+export -f install_deps install_dev_deps
+. build-bash-base.sh "$@"
+
+MAKE_LDFLAGS=-ldl
+ENABLE_SHARED=no
+ENABLE_STATIC=yes
+
+./configure CFLAGS="-O3" --prefix="$BUILD_PREFIX" --disable-all \
+  --enable-shared=$ENABLE_SHARED --enable-static=$ENABLE_STATIC --with-layout=GNU \
+  --with-pear=no --disable-cgi --disable-phpdbg \
+  --with-pcre-jit --enable-zstd --with-libzstd  \
+  --enable-pcntl --enable-posix \
+  --enable-sockets \
+  --enable-zts --enable-parallel \
+  --with-openssl --with-zlib \
+  "${BUILD_EXTRA[@]}"
+
+sed -ie 's/-export-dynamic//g' Makefile
+sed -ie 's/-o $(SAPI_CLI_PATH)/-all-static -o $(SAPI_CLI_PATH)/g' Makefile
+
+make LDFLAGS=$MAKE_LDFLAGS -j8
+make install-cli

build-alpine

@@ -6,6 +6,8 @@
 # received a copy of the license along with this program; if you did not,
 # you can find it at https://www.php.net/license/3_01.txt
 
+# ! This script is deprecated and we use muslc build on alpine.
+# See: build-alpine
 set -e
 install_deps() {
   sudo apt-get update -y
@@ -39,7 +41,6 @@ fi
   --enable-sockets \
   --enable-zts --enable-parallel \
   --with-openssl --with-zlib \
-  --enable-opcache \
   "${BUILD_EXTRA[@]}"
 
 if [[ "$BUILD_STATIC" == 1 ]]; then

build-linux

@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+# Copyright (c) 2022, Manticore Software LTD (https://manticoreseAPP_ARCH.com)
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the The PHP License, version 3.01. You should have
+# received a copy of the license along with this program; if you did not,
+# you can find it at https://www.php.net/license/3_01.txt
+# ! Must be defined: APP_ARCH, APP_NAME, APP_VERSION, GITHUB_SHA, RUNNER_OS
+# This script is part of tools to use in GitHub workflow
+
+assets="${APP_NAME}_${APP_VERSION}-$( date +%y%m%d )-${GITHUB_SHA:0:7}_$(echo "${RUNNER_OS}" | tr '[:upper:]' '[:lower:]')_${APP_ARCH}"
+
+pwd
+echo "$assets"
+mkdir -p "$assets"
+
+# If we have dist dir that means we built it on host machine
+if test -d dist; then
+  cp dist/bin/php "$assets/${APP_NAME}"
+else
+  id=$(docker create "${DOCKER_IMAGE}")
+  docker cp "$id:/usr/bin/${APP_NAME}" "$assets/${APP_NAME}"
+  chmod +x "$assets/${APP_NAME}"
+  docker rm -v "$id"
+fi
+
+# Add common files
+cp {README.md,LICENSE} "$assets/"
+
+# Finaly make assets arhive
+(
+  tar czf "$assets.tar.gz" "$assets"
+  ls -lah *.*
+)

collect-assets

@@ -0,0 +1,68 @@
+--------------------------------------------------------------------
+                  The PHP License, version 3.01
+Copyright (c) 1999 - 2019 The PHP Group. All rights reserved.
+--------------------------------------------------------------------
+
+Redistribution and use in source and binary forms, with or without
+modification, is permitted provided that the following conditions
+are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+
+  3. The name "PHP" must not be used to endorse or promote products
+     derived from this software without prior written permission. For
+     written permission, please contact group@php.net.
+
+  4. Products derived from this software may not be called "PHP", nor
+     may "PHP" appear in their name, without prior written permission
+     from group@php.net.  You may indicate that your software works in
+     conjunction with PHP by saying "Foo for PHP" instead of calling
+     it "PHP Foo" or "phpfoo"
+
+  5. The PHP Group may publish revised and/or new versions of the
+     license from time to time. Each version will be given a
+     distinguishing version number.
+     Once covered code has been published under a particular version
+     of the license, you may always continue to use it under the terms
+     of that version. You may also choose to use such covered code
+     under the terms of any subsequent version of the license
+     published by the PHP Group. No one other than the PHP Group has
+     the right to modify the terms applicable to covered code created
+     under this License.
+
+  6. Redistributions of any form whatsoever must retain the following
+     acknowledgment:
+     "This product includes PHP software, freely available from
+     <http://www.php.net/software/>".
+
+THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
+ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
+DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+
+--------------------------------------------------------------------
+
+This software consists of voluntary contributions made by many
+individuals on behalf of the PHP Group.
+
+The PHP Group can be contacted via Email at group@php.net.
+
+For more information on the PHP Group and the PHP project,
+please see <http://www.php.net>.
+
+PHP includes the Zend Engine, freely available at
+<http://www.zend.com>.

extra.LICENSE

@@ -3,7 +3,7 @@ Name: {{ NAME }}
 Version: {{ VERSION }}
 Release: 1%{?dist}
 Group: Applications
-License: PHP 3.01
+License: Apache-2.0
 Packager: {{ MAINTAINER }}
 Vendor: {{ MAINTAINER }}
 Requires: {{ EXECUTOR_NAME }} >= {{ EXECUTOR_VERSION }}
@@ -17,18 +17,23 @@ BuildArch: noarch
 {{ DESC }}
 
 %prep
+rm -rf %{buildroot}
+
+%setup -n %{name}
 
 %build
 
 %install
 
 %clean
+rm -rf %{buildroot}
 
 %post
 
 %postun
 
 %files
 %defattr(-, root, root)
+%license usr/share/{{ NAME }}-LICENSE
 
 %changelog