Compare commits
28 commits
5478552040
...
872a438dcf
Author | SHA1 | Date | |
---|---|---|---|
Hypolite Petovan | 872a438dcf | ||
Hypolite Petovan | da8681c8c4 | ||
Hypolite Petovan | 67c44792fd | ||
cfbbeaac62 | |||
32f698ce10 | |||
a110b2f6c1 | |||
fc33555cd6 | |||
e24e3f758a | |||
127ab370fc | |||
890bc3712f | |||
2cff751b12 | |||
89134542b4 | |||
453772e393 | |||
0bcf2d7c89 | |||
c6daf2381c | |||
51797d975b | |||
a40bd7009b | |||
1bcd23f684 | |||
Hypolite Petovan | f3bddaf7d6 | ||
Michael | 4a14bc47ee | ||
Hypolite Petovan | 09b3f01558 | ||
Philipp Holzer | e1f27d88b7 | ||
Philipp Holzer | 57c4735ad6 | ||
Philipp Holzer | 372a850103 | ||
Philipp Holzer | 7e890124a8 | ||
Philipp Holzer | 904bf11e54 | ||
Tobias Diekershoff | 1af97e5c9e | ||
Michael | 02a6fdd9a2 |
|
@ -45,7 +45,7 @@ pipeline:
|
||||||
branch: [ develop, '*-rc' ]
|
branch: [ develop, '*-rc' ]
|
||||||
event: push
|
event: push
|
||||||
composer_install:
|
composer_install:
|
||||||
image: friendicaci/php7.4:php7.4.33
|
image: friendicaci/php8.2:php8.2.16
|
||||||
commands:
|
commands:
|
||||||
- export COMPOSER_HOME=.composer
|
- export COMPOSER_HOME=.composer
|
||||||
- composer validate
|
- composer validate
|
||||||
|
|
|
@ -5,9 +5,11 @@ matrix:
|
||||||
- PHP_MAJOR_VERSION: 8.0
|
- PHP_MAJOR_VERSION: 8.0
|
||||||
PHP_VERSION: 8.0.30
|
PHP_VERSION: 8.0.30
|
||||||
- PHP_MAJOR_VERSION: 8.1
|
- PHP_MAJOR_VERSION: 8.1
|
||||||
PHP_VERSION: 8.1.23
|
PHP_VERSION: 8.1.27
|
||||||
- PHP_MAJOR_VERSION: 8.2
|
- PHP_MAJOR_VERSION: 8.2
|
||||||
PHP_VERSION: 8.2.11
|
PHP_VERSION: 8.2.16
|
||||||
|
- PHP_MAJOR_VERSION: 8.3
|
||||||
|
PHP_VERSION: 8.3.3
|
||||||
|
|
||||||
# This forces PHP Unit executions at the "opensocial" labeled location (because of much more power...)
|
# This forces PHP Unit executions at the "opensocial" labeled location (because of much more power...)
|
||||||
labels:
|
labels:
|
||||||
|
@ -76,7 +78,7 @@ pipeline:
|
||||||
- cp config/local-sample.config.php config/local.config.php
|
- cp config/local-sample.config.php config/local.config.php
|
||||||
- if ! bin/wait-for-connection $MYSQL_HOST $MYSQL_PORT 300; then echo "[ERROR] Waited 300 seconds, no response" >&2; exit 1; fi
|
- if ! bin/wait-for-connection $MYSQL_HOST $MYSQL_PORT 300; then echo "[ERROR] Waited 300 seconds, no response" >&2; exit 1; fi
|
||||||
- mysql -h$MYSQL_HOST -P$MYSQL_PORT -p$MYSQL_PASSWORD -u$MYSQL_USER $MYSQL_DATABASE < database.sql
|
- mysql -h$MYSQL_HOST -P$MYSQL_PORT -p$MYSQL_PASSWORD -u$MYSQL_USER $MYSQL_DATABASE < database.sql
|
||||||
- if [ "${PHP_MAJOR_VERSION}" = "7.4" -a "${CI_REPO}" = "friendica/friendica-addons" ]; then
|
- if [ "${PHP_MAJOR_VERSION}" = "8.2" -a "${CI_REPO}" = "friendica/friendica-addons" ]; then
|
||||||
phpenmod xdebug;
|
phpenmod xdebug;
|
||||||
export XDEBUG_MODE=coverage;
|
export XDEBUG_MODE=coverage;
|
||||||
phpunit --configuration tests/phpunit-addons.xml --coverage-clover clover.xml;
|
phpunit --configuration tests/phpunit-addons.xml --coverage-clover clover.xml;
|
||||||
|
@ -87,8 +89,8 @@ pipeline:
|
||||||
image: friendicaci/codecov
|
image: friendicaci/codecov
|
||||||
when:
|
when:
|
||||||
matrix:
|
matrix:
|
||||||
PHP_MAJOR_VERSION: 7.4
|
PHP_MAJOR_VERSION: 8.2
|
||||||
PHP_VERSION: 7.4.33
|
PHP_VERSION: 8.2.16
|
||||||
repo:
|
repo:
|
||||||
- friendica/friendica-addons
|
- friendica/friendica-addons
|
||||||
commands:
|
commands:
|
||||||
|
|
|
@ -42,7 +42,7 @@ pipeline:
|
||||||
repo: friendica/friendica-addons
|
repo: friendica/friendica-addons
|
||||||
event: tag
|
event: tag
|
||||||
composer_install:
|
composer_install:
|
||||||
image: friendicaci/php7.4:php7.4.33
|
image: friendicaci/php8.2:php8.2.16
|
||||||
commands:
|
commands:
|
||||||
- export COMPOSER_HOME=.composer
|
- export COMPOSER_HOME=.composer
|
||||||
- composer validate
|
- composer validate
|
||||||
|
|
|
@ -61,7 +61,7 @@ function blockbot_init_1()
|
||||||
'adscanner/', 'HeadlessChrome', 'wpif', 'startmebot/', 'Googlebot/', 'Applebot/',
|
'adscanner/', 'HeadlessChrome', 'wpif', 'startmebot/', 'Googlebot/', 'Applebot/',
|
||||||
'GoogleImageProxy', 'bingbot/', 'heritrix/', 'ldspider',
|
'GoogleImageProxy', 'bingbot/', 'heritrix/', 'ldspider',
|
||||||
'AwarioRssBot/', 'TweetmemeBot/', 'dcrawl/', 'PhantomJS/', 'Googlebot-Image/',
|
'AwarioRssBot/', 'TweetmemeBot/', 'dcrawl/', 'PhantomJS/', 'Googlebot-Image/',
|
||||||
'CrowdTanglebot/', 'Mediapartners-Google', 'Baiduspider/', 'datagnionbot',
|
'CrowdTanglebot/', 'Mediapartners-Google', 'Baiduspider', 'datagnionbot',
|
||||||
'MegaIndex.ru/', 'SMUrlExpander', 'Hatena-Favicon/', 'Wappalyzer', 'FlipboardProxy/',
|
'MegaIndex.ru/', 'SMUrlExpander', 'Hatena-Favicon/', 'Wappalyzer', 'FlipboardProxy/',
|
||||||
'NetcraftSurveyAgent/', 'Dataprovider.com', 'SMTBot/', 'Nimbostratus-Bot/',
|
'NetcraftSurveyAgent/', 'Dataprovider.com', 'SMTBot/', 'Nimbostratus-Bot/',
|
||||||
'DuckDuckGo-Favicons-Bot/', 'IndieWebCards/', 'proximic', 'netEstate NE Crawler',
|
'DuckDuckGo-Favicons-Bot/', 'IndieWebCards/', 'proximic', 'netEstate NE Crawler',
|
||||||
|
@ -83,7 +83,11 @@ function blockbot_init_1()
|
||||||
'BitSightBot/', 'ev-crawler/', 'CensysInspect/1.1', 'Protopage/', 'Gaisbot/', 'WellKnownBot/',
|
'BitSightBot/', 'ev-crawler/', 'CensysInspect/1.1', 'Protopage/', 'Gaisbot/', 'WellKnownBot/',
|
||||||
'SuperBot/', 'Googlebot-Mobile/', 'GPTBot/', 'GenomeCrawlerd/', '2ip bot/', 'Ocarinabot',
|
'SuperBot/', 'Googlebot-Mobile/', 'GPTBot/', 'GenomeCrawlerd/', '2ip bot/', 'Ocarinabot',
|
||||||
'Yahoo! Slurp;', 'AdsBot-Google', 'Gregarius/', 'FAST-WebCrawler/', 'Xenu Link Sleuth/',
|
'Yahoo! Slurp;', 'AdsBot-Google', 'Gregarius/', 'FAST-WebCrawler/', 'Xenu Link Sleuth/',
|
||||||
'Ask Jeeves'
|
'Ask Jeeves', 'alexa site audit/', 'Yahoo! Slurp China;', 'Microsoft URL Control',
|
||||||
|
'Facebot', 'Googlebot-Video/', 'msnbot/', 'Offline Explorer/', 'YandexNews/', 'msnbot-media/',
|
||||||
|
'EmailWolf', 'Download Demon/', 'FeedFetcher-Google;', 'WebCopier', '+ONB_Bot_Btrix',
|
||||||
|
'scoopit-crawler/', 'ia_archiver', 'Quora-Bot/', 'WebwikiBot/', 'FullStoryBot/',
|
||||||
|
'wpbot/', 'SearchExpress', 'DuckDuckBot/', 'Google Web Preview',
|
||||||
];
|
];
|
||||||
|
|
||||||
if (DI::config()->get('blockbot', 'block_gab')) {
|
if (DI::config()->get('blockbot', 'block_gab')) {
|
||||||
|
@ -97,7 +101,8 @@ function blockbot_init_1()
|
||||||
'PTST/', 'Zabbix', 'Poduptime/', 'FediFetcher', 'lemmy-stats-crawler',
|
'PTST/', 'Zabbix', 'Poduptime/', 'FediFetcher', 'lemmy-stats-crawler',
|
||||||
'FedditLemmyverseCrawler/', 'lemmy-explorer-crawler/', 'URIports Validator',
|
'FedditLemmyverseCrawler/', 'lemmy-explorer-crawler/', 'URIports Validator',
|
||||||
'rss-is-dead.lol web bot;', 'fedistatsCrawler/', 'W3C_CSS_Validator_JFouffa/',
|
'rss-is-dead.lol web bot;', 'fedistatsCrawler/', 'W3C_CSS_Validator_JFouffa/',
|
||||||
'IABot/', 'Slackbot 1',
|
'IABot/', 'Slackbot 1', 'BeeperBot/', 'Matrix-Media-Repo/', 'P3P Validator',
|
||||||
|
'KeybaseBot;',
|
||||||
];
|
];
|
||||||
|
|
||||||
if (!DI::config()->get('blockbot', 'good_crawlers')) {
|
if (!DI::config()->get('blockbot', 'good_crawlers')) {
|
||||||
|
@ -110,7 +115,7 @@ function blockbot_init_1()
|
||||||
$socialmedia_agents = ['Twitterbot', 'facebookexternalhit/', 'SkypeUriPreview Preview/',
|
$socialmedia_agents = ['Twitterbot', 'facebookexternalhit/', 'SkypeUriPreview Preview/',
|
||||||
'TelegramBot', 'WhatsApp/', 'github-camo', 'Bluesky Cardyb/', 'XING-contenttabreceiver/',
|
'TelegramBot', 'WhatsApp/', 'github-camo', 'Bluesky Cardyb/', 'XING-contenttabreceiver/',
|
||||||
'LinkedInBot/', 'Instagram ', 'Synapse (bot; ', 'Discordbot/', 'SummalyBot/',
|
'LinkedInBot/', 'Instagram ', 'Synapse (bot; ', 'Discordbot/', 'SummalyBot/',
|
||||||
'Slackbot-LinkExpanding', 'Slack-ImgProxy',
|
'Slackbot-LinkExpanding', 'Slack-ImgProxy', 'Iframely/',
|
||||||
];
|
];
|
||||||
|
|
||||||
if (!DI::config()->get('blockbot', 'socialmedia_agents')) {
|
if (!DI::config()->get('blockbot', 'socialmedia_agents')) {
|
||||||
|
@ -159,7 +164,7 @@ function blockbot_init_1()
|
||||||
'Slackbot-LinkExpanding', 'Firefish/', 'Takahe/', 'Akkoma ', 'Misskey/', 'Lynx/',
|
'Slackbot-LinkExpanding', 'Firefish/', 'Takahe/', 'Akkoma ', 'Misskey/', 'Lynx/',
|
||||||
'camo-rs asset proxy', 'gotosocial/', 'incestoma ', 'SpaceCowboys Android RSS Reader',
|
'camo-rs asset proxy', 'gotosocial/', 'incestoma ', 'SpaceCowboys Android RSS Reader',
|
||||||
'NewsBlur Feed Finder', 'Lemmy/', 'enby-town/', 'rss2tg bot;', '; HTTrack ',
|
'NewsBlur Feed Finder', 'Lemmy/', 'enby-town/', 'rss2tg bot;', '; HTTrack ',
|
||||||
'MbinBot', 'kbinBot'
|
'MbinBot', 'kbinBot', 'Pixelfed/', 'NewsBlur Feed Fetcher', 'NewsBlur Page Fetcher',
|
||||||
];
|
];
|
||||||
|
|
||||||
if (blockbot_match($agents)) {
|
if (blockbot_match($agents)) {
|
||||||
|
|
Loading…
Reference in a new issue