Skip to content

Commit cb89446

Browse files
committed
Merge branch 'master' of github.com:defuse/php-encryption
2 parents b43f87b + 55fbe1b commit cb89446

File tree

2 files changed

+25
-4
lines changed

2 files changed

+25
-4
lines changed

dist/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ box := $(shell which box)
55
composer := "composer"
66

77
.PHONY: all
8-
all: sign-phar
8+
all: build-phar
99

1010
.PHONY: sign-phar
11-
sign-phar: build-phar
11+
sign-phar:
1212
gpg -u 7B4B2D98 --armor --output defuse-crypto.phar.sig --detach-sig defuse-crypto.phar
1313

1414
# ensure we run in clean tree. export git tree and run there.

docs/InternalDeveloperDocs.md

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,32 @@ Check out the branch you want to release:
9696
git checkout <branchname>
9797
```
9898

99-
Generate and sign the `.phar`:
99+
Run the tests:
100+
101+
```
102+
composer install
103+
./test.sh
104+
```
105+
106+
Generate the `.phar`:
107+
108+
```
109+
cd dist
110+
make build-phar
111+
```
112+
113+
Test the `.phar`:
114+
115+
```
116+
cd ../
117+
./test.sh dist/defuse-crypto.phar
118+
```
119+
120+
Sign the `.phar`:
100121

101122
```
102123
cd dist
103-
make
124+
make sign-phar
104125
```
105126

106127
Tag the release:

0 commit comments

Comments
 (0)