Commit Graph

2144 Commits

Author SHA1 Message Date
github-actions[bot]
3a801bc238 Merge remote-tracking branch 'origin/master' into php8 2021-10-30 15:26:05 +00:00
El RIDO
e36a94cfdd
Merge branch 'php8-ci-yetagain' 2021-10-30 17:23:23 +02:00
El RIDO
b80b318e38
spaces 2021-10-30 17:23:09 +02:00
rugk
1fff4bf4d7
Also set author for merge commit
Follow-up of 41898282+github-actions[bot]@users.noreply.github.com again

In contrast to your suggestion, @elrido, I did use GitHubs bot account again. The mails won't spam anyone, and it's actually intended for such stuff.
Also, we get a proper avatar on GitHub's commit messages etc., and of course we know it is actually GitHubs (servers) that do this change.
2021-10-30 16:53:42 +02:00
El RIDO
20d39347c6
Merge pull request #852 from PrivateBin/php8-cifix
Set GitHub Bot as author for PHP8 merge commits
2021-10-24 11:04:40 +02:00
rugk
aa6e2f7631
Set GitHub Bot as author for PHP8 merge commits 2021-10-23 15:04:54 +02:00
El RIDO
3666db3b9a
Merge pull request #850 from LMS235/patch-1
Update de.json
2021-10-20 12:40:26 +02:00
El RIDO
5ba8266eb8
Merge pull request #848 from PrivateBin/php8-cifix2
Fix PHP refresh pipeline merge
2021-10-14 12:40:37 +02:00
Florian
86c5dc9db9
Update de.json
Link is not translated as "Verknüpfung", that is a separate term.
2021-10-14 09:04:29 +02:00
rugk
af852927a9
Fix PHP refresh pipeline merge
See https://github.com/PrivateBin/PrivateBin/pull/847#issuecomment-942580850

Now merging the origin as master is not yet pulled.
2021-10-13 20:07:45 +02:00
El RIDO
0fb104b102
Merge pull request #847 from PrivateBin/patch-pipeline
Fix PHP8 pipeline
2021-10-13 19:33:06 +02:00
rugk
f6421c9c7c
Fix PHP8 pipeline
As per https://github.com/PrivateBin/PrivateBin/pull/843#issuecomment-939526915

Co-Authored-By: El RIDO <elrido@gmx.net>
2021-10-11 17:45:42 +02:00
El RIDO
2d1552a345
Merge pull request #846 from PrivateBin/crowdin-translation
New Crowdin updates
2021-10-08 20:14:46 +02:00
PrivateBin Translator Bot
8085604385 New translations en.json (Czech) 2021-10-08 19:40:15 +02:00
El RIDO
31cdfc7be6
Merge pull request #845 from PrivateBin/crowdin-translation
New Crowdin updates
2021-10-08 19:12:13 +02:00
PrivateBin Translator Bot
307443dac3 New translations en.json (Czech) 2021-10-08 18:28:00 +02:00
El RIDO
91462da29d
update composer 2021-10-07 22:39:57 +02:00
El RIDO
5c61a442a0
phpunit compatibility 2021-10-07 22:36:11 +02:00
El RIDO
9c81d85bb7
phpunit compatibility 2021-10-07 22:34:15 +02:00
El RIDO
168ce1d85c
phpunit compatibility 2021-10-07 22:25:51 +02:00
El RIDO
1f6b962468
phpunit compatibility 2021-10-07 22:24:30 +02:00
El RIDO
1f95f57be9
phpunit compatibility 2021-10-07 22:22:32 +02:00
El RIDO
a2e479192f
phpunit compatibility 2021-10-07 22:20:25 +02:00
El RIDO
3f469f715f
Merge branch 'master' into php8 2021-10-07 22:17:11 +02:00
El RIDO
c5fd6028b5
Merge pull request #843 from PrivateBin/php8-ci
Add CI for automatic PHP8 branch updates
2021-10-07 21:00:09 +02:00
rugk
c7cd450f9b
Remove useless boilerplate comments 2021-10-06 20:19:03 +02:00
rugk
a988be7431
Add CI for automatic PHP8 updates
Adds a simple CI for pushing the master branches changes to the php8 branch.

Useful/discussed for https://github.com/PrivateBin/PrivateBin/issues/707
2021-10-06 20:13:09 +02:00
El RIDO
981304848f
Merge pull request #840 from PrivateBin/ci-cache
Cache PHP modules, composer and NodeJS stuff in CI
2021-10-04 10:03:31 +02:00
El RIDO
51a590c3c7
Merge pull request #841 from PrivateBin/ci-problem-matchers
Setup CI problem matchers for PHP
2021-10-02 20:15:22 +02:00
rugk
f4e68fcc04
style: better YAML comments 2021-10-02 01:12:08 +02:00
rugk
f43a41c117
Update tests.yml 2021-10-02 01:07:57 +02:00
rugk
ab11fbeb47
Fix syntax error
Apparently in envs the OS etc. syntax is not supported, so we need to use it like this.
2021-10-02 01:01:24 +02:00
rugk
5f4fe52eab
Use package-json instead of package-lock.json
for cache
2021-10-02 00:56:44 +02:00
rugk
b80732f8e2
Add caching for NodeJS 2021-10-02 00:55:08 +02:00
rugk
a372ee92e9
Fix wrong cache key 2021-10-02 00:43:54 +02:00
rugk
e2ae0da4e1
Style cleanup adding newlines
Seems to be the unofficial GitHub Actions YAML style and arguably makes things a lot more readable if you have a lot of steps…
2021-10-02 00:41:54 +02:00
rugk
3f7bceb862
Also cache PHP extensions
See https://github.com/shivammathur/cache-extensions#workflow
2021-10-02 00:38:21 +02:00
rugk
507a10adc5
Use composer.json instead of composer.lock
In a cache
2021-10-02 00:32:57 +02:00
rugk
a8f7840d25
Only restore cache from current date then 2021-10-02 00:29:48 +02:00
rugk
3ba6483bf3
Try caching composer stuff
Especially the GCM stuff may be quite large, so caching may be a good idea.

I tried following https://github.com/shivammathur/setup-php#cache-composer-dependencies
2021-10-02 00:27:57 +02:00
El RIDO
fba8384ac3
Merge pull request #836 from PrivateBin/crowdin-translation
New Crowdin updates
2021-09-28 05:59:13 +02:00
PrivateBin Translator Bot
def58480b3 New translations en.json (Occitan) 2021-09-27 10:21:34 +02:00
El RIDO
cb5ba022ba
Merge pull request #832 from PrivateBin/crowdin-translation
New Crowdin updates
2021-09-04 09:09:00 +02:00
PrivateBin Translator Bot
c5c3a0e743 New translations en.json (Turkish) 2021-09-03 18:58:00 +02:00
PrivateBin Translator Bot
3c068cd6c3 New translations en.json (Turkish) 2021-09-03 17:57:02 +02:00
El RIDO
82f1431440
Merge branch 'conf-path-handling' 2021-08-19 19:33:19 +02:00
El RIDO
df2f5931cd
improve readability, kudos @rugk 2021-08-19 19:28:52 +02:00
El RIDO
ff3b668958
apply StyleCI recommendation 2021-08-19 11:04:31 +02:00
El RIDO
eb10d4d35e
be more flexible with configuration paths
1. only consider CONFIG_PATH environment variable, if non-empty
2. fall back to search in PATH (defined in index.php), if CONFIG_PATH doesn't contain a readable configuration file
2021-08-19 10:21:21 +02:00
El RIDO
18972ae0fa
luckily the PHP ini parser doesn't interpret this as an empty block, replacing the one defined above 2021-08-19 10:18:08 +02:00