Skip to content

Commit 638875a

Browse files
committed
Merge origin/master
2 parents e6436c1 + b673051 commit 638875a

22 files changed

Lines changed: 251 additions & 96 deletions

.github/workflows/packaging.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: DebianPackage
2+
3+
on:
4+
release:
5+
types: [published, created, edited]
6+
7+
jobs:
8+
build:
9+
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: actions/checkout@master
14+
env:
15+
DEBIAN_FRONTEND: "noninteractive"
16+
- name: Prepare Debuild Environment
17+
run: |
18+
echo "deb http://repo.vitexsoftware.cz $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/vitexsoftware.list
19+
sudo wget -O /etc/apt/trusted.gpg.d/vitexsoftware.gpg http://repo.vitexsoftware.cz/keyring.gpg
20+
sudo apt-get update
21+
sudo apt-get install -y aptitude composer exim4 pbuilder ubuntu-dev-tools apt-file debhelper
22+
- name: Build Package
23+
run: debuild-pbuilder

.github/workflows/tests.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: PHPUnit
2+
on: [push]
3+
4+
jobs:
5+
build:
6+
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- uses: actions/checkout@master
11+
env:
12+
DEBIAN_FRONTEND: noninteractive
13+
- name: Prepare Environment
14+
run: |
15+
sudo apt-get update
16+
sudo apt-get install -y composer exim4
17+
composer update
18+
- name: Run tests
19+
run: vendor/bin/phpunit --bootstrap tests/Bootstrap.php --configuration phpunit.xml tests/src/

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,8 @@
55
/.phpunit.result.cache
66
/tests/nb-phpunit-coverage.xml
77
/tests/nb-phpunit-log.xml
8+
/debian/php-ease-html
9+
/debian/php-ease-html-dev.substvars
10+
/debian/php-ease-html-dev.debhelper.log
11+
/debian/.debhelper
12+
/debian/php-ease-html-dev/

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#DESTDIR ?= debian/php-ease-html/DEBIAN
2-
#libdir ?= /usr/share/php/Ease
2+
#libdir ?= /usr/share/php/EaseHtml
33
#docdir ?= /doc/ease-html/html
44

55
all: build install
@@ -36,9 +36,11 @@ apigen:
3636
composer:
3737
composer update
3838

39-
phpunit:
39+
phpunit: composer
4040
vendor/bin/phpunit --bootstrap tests/Bootstrap.php --configuration phpunit.xml tests/src/
4141

42+
test: phpunit
43+
4244
deb:
4345
dch -i "`git log -1 --pretty=%B`"
4446
debuild -i -us -uc -b

debian/README.Debian

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Ease framework Core for Debian
1+
Ease framework HTML for Debian
22
------------------------------
33

4-
Is installed by standard way in /usr/share/php/EaseCore
4+
Is installed by standard way in /usr/share/php/EaseHtml
55

66
-- Vítězslav Dvořák <vitex@hippy.cz> Ne říj 21 15:17:56 CEST 2012
77

debian/changelog

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
1-
php-ease-html (0.5) UNRELEASED; urgency=medium
1+
php-ease-html (0.15) UNRELEASED; urgency=medium
22

33
* First release
44
* Backported Mailer
55
* Backported Mailer
66
* Backported Mailer
77
* Another Unit tests
8+
* All Tests pass
9+
* All Tests pass
10+
* All Tests pass
11+
* All Tests pass
12+
* All Tests pass
13+
* All Tests pass
14+
* All Tests pass
15+
* All Tests pass
16+
* All Tests pass
17+
* All Tests pass
818

9-
-- Vítězslav Dvořák <info@vitexsoftware.cz> Wed, 02 Oct 2019 22:40:24 +0200
19+
-- Vítězslav Dvořák <info@vitexsoftware.cz> Sat, 12 Oct 2019 14:34:53 +0200

debian/control

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Source: php-ease-html
2-
Build-Depends: debhelper (>= 7.0.50~)
2+
Build-Depends: debhelper (>= 7.0.50~), php-ease-core
33
Section: web
44
Standards-Version: 3.9.8
55
Maintainer: Vítězslav Dvořák <info@vitexsoftware.cz>
66
Uploaders: Vitex <vitex@hippy.cz>
77
Priority: optional
8-
Homepage: https://github.com/VitexSoftware/ease-html
8+
Homepage: https://github.com/VitexSoftware/php-ease-html
99

1010
Package: php-ease-html
1111
Depends: ${misc:Depends},libjs-jquery (>= 1.4), php-mail, php-mail-mime, php-ease-core
@@ -16,3 +16,13 @@ Section: web
1616
Priority: optional
1717
Description: EasePHP Framework HTML support
1818
HTML classes for Ease Framework.
19+
20+
Package: php-ease-html-dev
21+
Depends: ${misc:Depends}, php-ease-core-dev
22+
Architecture: all
23+
Conflicts: ease-framework
24+
Section: devel
25+
Priority: optional
26+
Description: EasePHP Framework HTML unit tests
27+
HTML classes for Ease Framework.
28+

debian/debhelper-build-stamp

Lines changed: 0 additions & 1 deletion
This file was deleted.

debian/files

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

debian/php-ease-html-dev.install

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
src/Ease/* usr/share/php/EaseHtmlTests/
2+
debian/test/composer.json usr/share/php/EaseHtmlTests/
3+
debian/test/Bootstrap.php usr/share/php/EaseHtmlTests/

0 commit comments

Comments
 (0)