From 876b424ae355e1e94ed66abfe539fc4c62b4d091 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Sun, 9 May 2021 21:19:49 +0200
Subject: [PATCH 1/3] Re-enable DRONE

---
 mods/.drone.yml => .drone.yml | 2 --
 1 file changed, 2 deletions(-)
 rename mods/.drone.yml => .drone.yml (98%)

diff --git a/mods/.drone.yml b/.drone.yml
similarity index 98%
rename from mods/.drone.yml
rename to .drone.yml
index 696bbfa803..d86527c6a9 100644
--- a/mods/.drone.yml
+++ b/.drone.yml
@@ -1,5 +1,3 @@
-# Drone.io test YML-File, currently disabled
-# See https://github.com/friendica/friendica/pull/7643 for further infos
 kind: pipeline
 name: mysql8.0-php7.1
 

From 57bba711dc64de7796730750873fb5bbc3302337 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Sun, 9 May 2021 22:56:00 +0200
Subject: [PATCH 2/3] Switch messages.po check to drone

---
 .drone.yml                      | 499 +-------------------------------
 .github/workflows/transifex.yml |  31 --
 2 files changed, 10 insertions(+), 520 deletions(-)
 delete mode 100644 .github/workflows/transifex.yml

diff --git a/.drone.yml b/.drone.yml
index d86527c6a9..d06389c67f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,493 +1,14 @@
 kind: pipeline
-name: mysql8.0-php7.1
+type: docker
+name: Check messasges.po
 
 steps:
-- name: mysql8.0-php7.1
-  image: friendicaci/php7.1:php7.1.32
-  commands:
-      - NOCOVERAGE=true ./autotest.sh mysql
-  environment:
-    MYSQL_USERNAME: friendica
-    MYSQL_PASSWORD: friendica
-    MYSQL_DATABASE: friendica
-    MYSQL_HOST: mysql
+  - name: Run default Xgettext
+    image: friendicaci/transifex
+    commands:
+      - ./bin/run_xgettext.sh
 
-node:
-  test: db
-
-services:
-- name: mysql
-  image: mysql:8.0
-  command: [ "--default-authentication-plugin=mysql_native_password" ]
-  environment:
-    MYSQL_ROOT_PASSWORD: friendica
-    MYSQL_USER: friendica
-    MYSQL_PASSWORD: friendica
-    MYSQL_DATABASE: friendica
-  volumes:
-    - name: cache
-      path: /var/lib/mysql
-
-volumes:
-- name: cache
-  temp: {}
-
-trigger:
-  branch:
-#    - stable
-    - develop
-#    - "*-rc"
-#  event:
-#    - pull_request
-#    - push
----
-kind: pipeline
-name: mysql8.0-php7.2
-
-steps:
-- name: mysql8.0-php7.2
-  image: friendicaci/php7.2:php7.2.22
-  commands:
-    - NOCOVERAGE=true ./autotest.sh mysql
-  environment:
-    MYSQL_USERNAME: friendica
-    MYSQL_PASSWORD: friendica
-    MYSQL_DATABASE: friendica
-    MYSQL_HOST: mysql
-
-node:
-  test: db
-
-services:
-- name: mysql
-  image: mysql:8.0
-  command: [ "--default-authentication-plugin=mysql_native_password" ]
-  environment:
-    MYSQL_ROOT_PASSWORD: friendica
-    MYSQL_USER: friendica
-    MYSQL_PASSWORD: friendica
-    MYSQL_DATABASE: friendica
-  volumes:
-    - name: cache
-      path: /var/lib/mysql
-
-volumes:
-  - name: cache
-    temp: {}
-
-trigger:
-  branch:
-#    - stable
-    - develop
-#    - "*-rc"
-#  event:
-#    - pull_request
-#    - push
----
-kind: pipeline
-name: mysql8.0-php7.3
-
-steps:
-- name: mysql8.0-php7.3
-  image: friendicaci/php7.3:php7.3.9
-  commands:
-      - NOCOVERAGE=true ./autotest.sh mysql
-  environment:
-      MYSQL_USERNAME: friendica
-      MYSQL_PASSWORD: friendica
-      MYSQL_DATABASE: friendica
-      MYSQL_HOST: mysql
-
-node:
-  test: db
-
-services:
-- name: mysql
-  image: mysql:8.0
-  command: [ "--default-authentication-plugin=mysql_native_password" ]
-  environment:
-      MYSQL_ROOT_PASSWORD: friendica
-      MYSQL_USER: friendica
-      MYSQL_PASSWORD: friendica
-      MYSQL_DATABASE: friendica
-  volumes:
-    - name: cache
-      path: /var/lib/mysql
-
-volumes:
-  - name: cache
-    temp: {}
-
-trigger:
-  branch:
-#    - stable
-    - develop
-#    - "*-rc"
-#  event:
-#    - pull_request
-#    - push
----
-kind: pipeline
-name: mariadb10.1-php7.1
-
-steps:
-- name: mariadb10.1-php7.1
-  image: friendicaci/php7.1:php7.1.32
-  commands:
-      - phpenmod xdebug
-      - sleep 20
-      - ./autotest.sh mariadb
-      - wget https://codecov.io/bash -O codecov.sh
-      - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi"
-      - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi"
-  environment:
-      MYSQL_USER: friendica
-      MYSQL_PASSWORD: friendica
-      MYSQL_DATABASE: friendica
-      MYSQL_HOST: mariadb
-
-node:
-  test: db
-
-services:
-- name: mariadb
-  image: mariadb:10.1
-  environment:
-      MYSQL_ROOT_PASSWORD: friendica
-      MYSQL_USER: friendica
-      MYSQL_PASSWORD: friendica
-      MYSQL_DATABASE: friendica
-  volumes:
-    - name: cache
-      path: /var/lib/mysql
-
-volumes:
-  - name: cache
-    temp: {}
-
-trigger:
-  branch:
-#    - stable
-    - develop
-#    - "*-rc"
-#  event:
-#    - pull_request
-#    - push
----
-kind: pipeline
-name: mariadb10.1-php7.2
-
-steps:
-- name: mariadb10.1-php7.2
-  image: friendicaci/php7.2:php7.2.22
-  commands:
-      - NOCOVERAGE=true ./autotest.sh mariadb
-  environment:
-      MYSQL_USER: friendica
-      MYSQL_PASSWORD: friendica
-      MYSQL_DATABASE: friendica
-      MYSQL_HOST: mariadb
-
-node:
-  test: db
-
-services:
-- name: mariadb
-  image: mariadb:10.1
-  environment:
-      MYSQL_ROOT_PASSWORD: friendica
-      MYSQL_USER: friendica
-      MYSQL_PASSWORD: friendica
-      MYSQL_DATABASE: friendica
-  volumes:
-    - name: cache
-      path: /var/lib/mysql
-
-volumes:
-  - name: cache
-    temp: {}
-
-trigger:
-  branch:
-#    - stable
-    - develop
-#    - "*-rc"
-#  event:
-#    - pull_request
-#    - push
----
-kind: pipeline
-name: mariadb10.1-php7.3
-
-steps:
-- name: mariadb10.1-php7.3
-  image: friendicaci/php7.3:php7.3.9
-  commands:
-      - NOCOVERAGE=true ./autotest.sh mariadb
-  environment:
-      MYSQL_USER: friendica
-      MYSQL_PASSWORD: friendica
-      MYSQL_DATABASE: friendica
-      MYSQL_HOST: mariadb
-
-node:
-  test: db
-
-services:
-- name: mariadb
-  image: mariadb:10.1
-  environment:
-      MYSQL_ROOT_PASSWORD: friendica
-      MYSQL_USER: friendica
-      MYSQL_PASSWORD: friendica
-      MYSQL_DATABASE: friendica
-  volumes:
-    - name: cache
-      path: /var/lib/mysql
-
-volumes:
-  - name: cache
-    temp: {}
-
-trigger:
-  branch:
-#    - stable
-    - develop
-#    - "*-rc"
-#  event:
-#    - pull_request
-#    - push
----
-kind: pipeline
-name: redis-php7.1
-
-steps:
-- name: redis-php7.1
-  image: friendicaci/php7.1:php7.1.32
-  commands:
-    - phpenmod xdebug
-    - sleep 20
-    - NOINSTALL=true TEST_SELECTION=REDIS ./autotest.sh mysql
-    - wget https://codecov.io/bash -O codecov.sh
-    - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi"
-    - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi"
-  environment:
-      REDIS_HOST: redis
-
-services:
-- name: redis
-  image: redis
-
-trigger:
-  branch:
-#    - stable
-    - develop
-#    - "*-rc"
-#  event:
-#    - pull_request
-#    - push
----
-kind: pipeline
-name: redis-php7.2
-
-steps:
-- name: redis-php7.2
-  image: friendicaci/php7.2:php7.2.22
-  commands:
-      - NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=REDIS ./autotest.sh mysql
-  environment:
-    REDIS_HOST: redis
-
-services:
-- name: redis
-  image: redis
-
-trigger:
-  branch:
-#    - stable
-    - develop
-#    - "*-rc"
-#  event:
-#    - pull_request
-#    - push
----
-kind: pipeline
-name: redis-php7.3
-
-steps:
-- name: redis-php7.3
-  image: friendicaci/php7.3:php7.3.9
-  commands:
-      - NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=REDIS ./autotest.sh mysql
-  environment:
-    REDIS_HOST: redis
-
-services:
-- name: redis
-  image: redis
-
-trigger:
-  branch:
-#    - stable
-    - develop
-#    - "*-rc"
-#  event:
-#    - pull_request
-#    - push
-
----
-kind: pipeline
-name: memcache-php7.1
-
-steps:
-- name: memcache-php7.1
-  image: friendicaci/php7.1:php7.1.32
-  commands:
-      - phpenmod xdebug
-      - sleep 20
-      - NOINSTALL=true TEST_SELECTION=MEMCACHE ./autotest.sh mysql
-      - wget https://codecov.io/bash -O codecov.sh
-      - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi"
-      - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi"
-  environment:
-      MEMCACHE_HOST: memcached
-
-services:
-- name: memcached
-  image: memcached
-
-trigger:
-  branch:
-#    - stable
-    - develop
-#    - "*-rc"
-#  event:
-#    - pull_request
-#    - push
----
-kind: pipeline
-name: memcache-php7.2
-
-steps:
-- name: memcache-php7.2
-  image: friendicaci/php7.2:php7.2.22
-  commands:
-      - NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=MEMCACHE ./autotest.sh mysql
-  environment:
-      MEMCACHE_HOST: memcached
-
-services:
-- name: memcached
-  image: memcached
-
-trigger:
-  branch:
-#    - stable
-    - develop
-#    - "*-rc"
-#  event:
-#    - pull_request
-#    - push
----
-kind: pipeline
-name: memcache-php7.3
-
-steps:
-- name: memcache-php7.3
-  image: friendicaci/php7.3:php7.3.9
-  commands:
-      - NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=MEMCACHE ./autotest.sh mysql
-  environment:
-      MEMCACHE_HOST: memcached
-
-services:
-- name: memcached
-  image: memcached
-
-trigger:
-  branch:
-#    - stable
-    - develop
-#    - "*-rc"
-#  event:
-#    - pull_request
-#    - push
-
-
----
-kind: pipeline
-name: memcached-php7.1
-
-steps:
-- name: memcached-php7.1
-  image: friendicaci/php7.1:php7.1.32
-  commands:
-      - phpenmod xdebug
-      - sleep 20
-      - NOINSTALL=true TEST_SELECTION=MEMCACHED ./autotest.sh mysql
-      - wget https://codecov.io/bash -O codecov.sh
-      - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi"
-      - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi"
-  environment:
-      MEMCACHED_HOST: memcached
-
-services:
-- name: memcached
-  image: memcached
-
-trigger:
-  branch:
-#    - stable
-    - develop
-#    - "*-rc"
-#  event:
-#    - pull_request
-#    - push
----
-kind: pipeline
-name: memcached-php7.2
-
-steps:
-- name: memcached-php7.2
-  image: friendicaci/php7.2:php7.2.22
-  commands:
-      - NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=MEMCACHED ./autotest.sh mysql
-  environment:
-      MEMCACHED_HOST: memcached
-
-services:
-- name: memcached
-  image: memcached
-
-trigger:
-  branch:
-#    - stable
-    - develop
-#    - "*-rc"
-#  event:
-#    - pull_request
-#    - push
----
-kind: pipeline
-name: memcached-php7.3
-
-steps:
-- name: memcached-php7.3
-  image: friendicaci/php7.3:php7.3.9
-  commands:
-      - NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=MEMCACHED ./autotest.sh mysql
-  environment:
-      MEMCACHED_HOST: memcached
-
-services:
-- name: memcached
-  image: memcached
-
-trigger:
-  branch:
-#    - stable
-    - develop
-#    - "*-rc"
-#  event:
-#    - pull_request
-#    - push
+  - name: Check default
+    image: friendicaci/transifex
+    commands:
+      - /check-messages.sh
\ No newline at end of file
diff --git a/.github/workflows/transifex.yml b/.github/workflows/transifex.yml
deleted file mode 100644
index b775b08441..0000000000
--- a/.github/workflows/transifex.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Transifex
-on: [push, pull_request]
-
-jobs:
-  messages:
-    name: Check messages.po changes
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install gettext
-        run: sudo apt-get install gettext
-
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Run Xgettext
-        run: ./bin/run_xgettext.sh
-
-      - name: Check if messages.po needs an update
-        run: |
-          echo "::group::Check messages.po"
-          # Skip first 4 lines in possible diff, because they're header
-          # Skip all lines of the git diff starting with "@@" or comments or starting "POT-Creation-Date"
-          if [[ $(git diff -U0 ./view/lang/C/messages.po | awk '!/@@|-"POT-Creation-Date|+"POT-Creation-Date|-#|+#/{print }' | wc -l) -gt 4 ]]; then
-            echo "::error file=messages.po::messages.po is out of date"
-            echo "$(git diff ./view/lang/C/messages.po)"
-            exit 1
-          else
-            echo "Nothing to update"
-          fi
-          echo "::endgroup::"
-        shell: bash

From 5d3c399f3351580fe9c8c58b5d385d6ca994738c Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Sun, 9 May 2021 23:28:08 +0200
Subject: [PATCH 3/3] fix type

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index d06389c67f..53be71e317 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,6 +1,6 @@
 kind: pipeline
 type: docker
-name: Check messasges.po
+name: Check messages.po
 
 steps:
   - name: Run default Xgettext