Skip to content
This repository was archived by the owner on Jan 23, 2026. It is now read-only.

1.3.0 #29

Merged
sergeyklay merged 9 commits into from
Jul 28, 2018
Merged

1.3.0 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cbf1243
Added ability to build packages for Ubuntu 18.04
sergeyklay Jul 27, 2018
b557eaf
Cleaned supported ubuntu distros
sergeyklay Jul 27, 2018
d5e5600
Fixed debian/changelog
sergeyklay Jul 28, 2018
bfecc23
Added a common Debian/Ubuntu prebuild.sh script
sergeyklay Jul 28, 2018
a12767b
Added TMPDIR variable to the build container
sergeyklay Jul 28, 2018
8753299
Make sure that we use the same Packer always
sergeyklay Jul 28, 2018
0756789
Bump version
sergeyklay Jul 28, 2018
61c2d7a
Update CHANGELOG.md [ci skip]
sergeyklay Jul 28, 2018
48ba874
Update copyright
sergeyklay Jul 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .travis.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@ include $(SCRIPTDIR)/builder/check.mk
include $(SCRIPTDIR)/builder/patching.mk

$(SCRIPTDIR)/packpack:
$(shell git clone -q --depth=1 $(PACK_REPO) -b $(PACK_BRANCH) $(SCRIPTDIR)/packpack)
$(shell git clone --depth=1 --branch=$(PACK_BRANCH) $(PACK_REPO) $(SCRIPTDIR)/packpack)
$(shell cd $(SCRIPTDIR)/packpack && git checkout -qf $(PACK_COMMIT))
$(info -------------------------------------------------------------------)
$(info Patching packpak...)
$(shell cd $(SCRIPTDIR)/packpack && git apply $(SCRIPTDIR)/gh-84.patch)
$(shell cd $(SCRIPTDIR)/packpack && git apply $(SCRIPTDIR)/gh-97.patch)
$(info -------------------------------------------------------------------)

.PHONY: source
Expand Down
61 changes: 59 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# obtain it through the world-wide-web, please send an email
# to [email protected] so we can send you a copy immediately.
#
# Authors: Phalcon Framework Team <[email protected]>
# Authors: Phalcon Team <[email protected]>
#

sudo: required
Expand Down Expand Up @@ -45,7 +45,7 @@ env:
- STABLE_BRANCH=v3.4.0
- NIGHTLY_BRANCH=3.4.x
# This should be increased to reb-build and push package
- STABLE_BUILD_VERSION=2
- STABLE_BUILD_VERSION=5
- NIGHTLY_BUILD_VERSION=$TRAVIS_BUILD_NUMBER
- TARGET=package
- RE2C_VERSION="1.0.3"
Expand All @@ -60,6 +60,9 @@ env:
- OS=ubuntu DIST=xenial PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH
- OS=ubuntu DIST=xenial PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH PHP_VERSION=7.1
- OS=ubuntu DIST=xenial PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH PHP_VERSION=7.2
- OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH
- OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH PHP_VERSION=7.1
- OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH PHP_VERSION=7.2
- OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH
- OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH PHP_VERSION=7.0
- OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH PHP_VERSION=7.1
Expand All @@ -76,6 +79,9 @@ env:
- OS=ubuntu DIST=xenial PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH
- OS=ubuntu DIST=xenial PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.1
- OS=ubuntu DIST=xenial PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.2
- OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH
- OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.1
- OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.2
- OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH
- OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.0
- OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.1
Expand All @@ -96,6 +102,9 @@ matrix:
- env: OS=ubuntu DIST=xenial PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH
- env: OS=ubuntu DIST=xenial PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.1
- env: OS=ubuntu DIST=xenial PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.2
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.1
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.2
- env: OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH
- env: OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.0
- env: OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.1
Expand All @@ -112,6 +121,10 @@ matrix:
php: 5.5
- env: OS=ubuntu DIST=xenial PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH
php: 5.5
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH
php: 5.5
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH
php: 5.5
- env: OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH
php: 5.5
- env: OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH PHP_VERSION=7.0
Expand All @@ -132,6 +145,10 @@ matrix:
php: 5.5
- env: OS=ubuntu DIST=xenial PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.1
php: 5.5
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH PHP_VERSION=7.1
php: 5.5
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.1
php: 5.5
- env: OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH PHP_VERSION=7.1
php: 5.5
- env: OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.1
Expand All @@ -148,6 +165,10 @@ matrix:
php: 5.5
- env: OS=ubuntu DIST=xenial PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.2
php: 5.5
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH PHP_VERSION=7.2
php: 5.5
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.2
php: 5.5
- env: OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH PHP_VERSION=7.2
php: 5.5
- env: OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.2
Expand All @@ -168,6 +189,10 @@ matrix:
php: 5.6
- env: OS=ubuntu DIST=xenial PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH
php: 5.6
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH
php: 5.6
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH
php: 5.6
- env: OS=debian DIST=stretch PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH
php: 5.6
- env: OS=debian DIST=stretch PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH
Expand All @@ -184,6 +209,10 @@ matrix:
php: 5.6
- env: OS=ubuntu DIST=xenial PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.1
php: 5.6
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH PHP_VERSION=7.1
php: 5.6
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.1
php: 5.6
- env: OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH PHP_VERSION=7.1
php: 5.6
- env: OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.1
Expand All @@ -200,6 +229,10 @@ matrix:
php: 5.6
- env: OS=ubuntu DIST=xenial PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.2
php: 5.6
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH PHP_VERSION=7.2
php: 5.6
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.2
php: 5.6
- env: OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH PHP_VERSION=7.2
php: 5.6
- env: OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.2
Expand All @@ -224,6 +257,10 @@ matrix:
php: 7.0
- env: OS=ubuntu DIST=xenial PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.1
php: 7.0
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH PHP_VERSION=7.1
php: 7.0
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.1
php: 7.0
- env: OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH PHP_VERSION=7.1
php: 7.0
- env: OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.1
Expand All @@ -240,6 +277,10 @@ matrix:
php: 7.0
- env: OS=ubuntu DIST=xenial PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.2
php: 7.0
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH PHP_VERSION=7.2
php: 7.0
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.2
php: 7.0
- env: OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH PHP_VERSION=7.2
php: 7.0
- env: OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.2
Expand Down Expand Up @@ -268,6 +309,14 @@ matrix:
php: 7.1
- env: OS=ubuntu DIST=xenial PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.2
php: 7.1
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH
php: 7.1
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH PHP_VERSION=7.2
php: 7.1
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH
php: 7.1
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.2
php: 7.1
- env: OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH
php: 7.1
- env: OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH PHP_VERSION=7.0
Expand Down Expand Up @@ -308,6 +357,14 @@ matrix:
php: 7.2
- env: OS=ubuntu DIST=xenial PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.1
php: 7.2
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH
php: 7.2
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH PHP_VERSION=7.1
php: 7.2
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH
php: 7.2
- env: OS=ubuntu DIST=bionic PACKAGE=deb CLONE_BRANCH=$NIGHTLY_BRANCH PHP_VERSION=7.1
php: 7.2
- env: OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH
php: 7.2
- env: OS=debian DIST=jessie PACKAGE=deb CLONE_BRANCH=$STABLE_BRANCH PHP_VERSION=7.0
Expand Down
16 changes: 14 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [1.3.0] - 2018-07-28
### Added
- Added ability to build packages for Ubuntu 18.04 [phalcongelist/packagecloud#27](https://github.com/phalcongelist/packagecloud/issues/27), [phalcon/cphalcon#13376](https://github.com/phalcon/cphalcon/issues/13376)
- Added a common Debian/Ubuntu `prebuild.sh` script

### Changed
- Freezed packpack version to make sure that we use the same packpack always

### Fixed
- Added `TMPDIR` variable to the build container [packpack/packpack#97](https://github.com/packpack/packpack/issues/97)

## [1.2.3] - 2018-03-10
### Fixed
- Patching packpack due to https://github.com/packpack/packpack/pull/84#issuecomment-371755389
- Patching packpack due to [packpack/packpack#84](https://github.com/packpack/packpack/pull/84#issuecomment-371755389)

## [1.2.2] - 2017-07-10
### Changed
Expand Down Expand Up @@ -46,7 +57,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
Ubuntu 14.04-16.04, Debian 8.5-9 and CentOS 7.2 by using
[Packpack](https://github.com/packpack/packpack).

[Unreleased]: https://github.com/phalcongelist/packagecloud/compare/v1.2.3...HEAD
[Unreleased]: https://github.com/phalcongelist/packagecloud/compare/v1.3.0...HEAD
[1.3.0]: https://github.com/phalcongelist/packagecloud/compare/v1.2.3...v1.3.0
[1.2.3]: https://github.com/phalcongelist/packagecloud/compare/v1.2.2...v1.2.3
[1.2.2]: https://github.com/phalcongelist/packagecloud/compare/v1.2.1...v1.2.2
[1.2.1]: https://github.com/phalcongelist/packagecloud/compare/v1.2.0...v1.2.1
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
New BSD License

Copyright (c) 2011-present, Phalcon Framework Team
Copyright (c) 2011-present, Phalcon Team
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ Installation/configuration details for each version and operating system [can be
| `xenial` | 16.04 LTS | `3.0.0` - `3.4.0` | `7.0.x` |
| `xenial` | 16.04 LTS | `3.1.2` - `3.4.0` | `7.1.x` |
| `xenial` | 16.04 LTS | `3.3.0` - `3.4.0` | `7.2.x` |
| `bionic` | 18.04 LTS | `3.4.0` | `7.0.x` |
| `bionic` | 18.04 LTS | `3.4.0` | `7.1.x` |
| `bionic` | 18.04 LTS | `3.4.0` | `7.2.x` |

### Debian

Expand Down
3 changes: 2 additions & 1 deletion builder/config.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ CHANGELOG_TEXT=Automated build. See details at release page https://github.com/p

PACK_REPO=https://github.com/packpack/packpack.git
PACK_BRANCH=master
PACK_COMMIT=30ff7b51654c19b8919d01ca8d4aa480e87e8241

DOCKER_REPO=phalconphp/build

Expand All @@ -35,7 +36,7 @@ STABLE_BUILD_VERSION?=1
FEDORA:=fedora-rawhide fedora24 fedora23
CENTOS:=centos7 centos6
DEBIAN:=debian-sid debian-stretch debian-jessie debian-wheezy
UBUNTU:=ubuntu-yakkety ubuntu-xenial ubuntu-wily ubuntu-trusty ubuntu-precise
UBUNTU:=ubuntu-bionic ubuntu-xenial ubuntu-trusty

DEBS:=$(DEBIAN) $(UBUNTU)
RPMS:=$(FEDORA) $(CENTOS)
Expand Down
5 changes: 4 additions & 1 deletion debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
php-phalcon (3.1.0-1) stable; urgency=low

-- Serghei Iakovlev <[email protected]> Wed, 22 Mar 2017 21:30:00 +0300
* Automated build. See details at release page
https://github.com/phalcon/cphalcon/releases

-- Serghei Iakovlev <[email protected]> Wed, 22 Mar 2017 21:30:00 +0300
6 changes: 3 additions & 3 deletions debian/copyright
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Format: http://dep.debian.net/deps/dep5/
Debianized-By: Serghei Iakovlev <[email protected]>
Upstream-Name: php-phalcon
Upstream-Contact: Phalcon Framework Team <[email protected]>
Upstream-Contact: Phalcon Team <[email protected]>
Source: https://github.com/phalcon/cphalcon

Files: *
Copyright: Copyright (c) 2011-present Phalcon Framework Team <[email protected]>
Copyright: Copyright (c) 2011-present Phalcon Team <[email protected]>
License: BSD-3-clause
Copyright (c) 2011-present, Phalcon Framework Team <[email protected]>
Copyright (c) 2011-present, Phalcon Team <[email protected]>
All rights reserved.
.
Redistribution and use in source and binary forms, with or without
Expand Down
9 changes: 9 additions & 0 deletions debian/prebuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash

# This line instructs debconf to store in its database an answer for
# the program debconf. If (the running program) debconf later asks
# (the database of answers) debconf what is my frontend the answer
# will be frontend is Noninteractive.
#
# It has nothing to do with the interactivity of bash.
echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
12 changes: 12 additions & 0 deletions gh-97.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/packpack b/packpack
index 6f4c80f..1659773 100755
--- a/packpack
+++ b/packpack
@@ -155,6 +155,7 @@ docker run \
--entrypoint=/build/userwrapper.sh \
-e XDG_CACHE_HOME=/cache \
-e CCACHE_DIR=/cache/ccache \
+ -e TMPDIR=/tmp \
--volume "${CACHE_DIR}:/cache" \
${DOCKER_REPO}:${DOCKER_IMAGE} \
make -f /pack/Makefile -C /source BUILDDIR=/build -j "$@"