From cff3a5186ce20aac984f818afe34a44ee7cdf995 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Sun, 2 May 2021 23:46:06 +0200
Subject: [PATCH] Fixings

---
 .github/workflows/releases.yml | 66 ++++++++++++++++++++++++++--------
 rector.php                     |  1 -
 2 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index a10ca28099..b0987e9f28 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -10,23 +10,42 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          tools: pecl, composer:v1
+
       - name: Retrieve version
         id: release
-        run: echo "::set-output name=version::$(echo VERSION)"
+        run: echo "::set-output name=version::$(cat VERSION)"
 
-      - name: Build project for production
-        run: |
-          composer install --no-dev --optimize-autoloader
-          mkdir build
+      - name: Validate composer.json and composer.lock
+        run: composer validate
+
+      - name: Get composer cache directory
+        id: composercache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composercache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer install --no-dev --optimize-autoloader
 
       - name: Create artifact
-        run: tar -xvjf build/friendica-full-${{ steps.release.outputs.version }}.tar.gz -T mods/release-list.txt
+        run: |
+          mkdir build
+          tar -cvjf build/friendica-full-${{ steps.release.outputs.version }}.tar.gz -T mods/release-list.txt
 
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
           name: friendica
-          path: build/build/friendica-full-${{ steps.release.outputs.version }}.tar.gz
+          path: build/friendica-full-${{ steps.release.outputs.version }}.tar.gz
 
 #      - name: Upload to release
 #        uses: JasonEtco/upload-to-release@master
@@ -41,28 +60,47 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          tools: pecl, composer:v1
+
       - name: Retrieve version
         id: release
-        run: echo "::set-output name=version::$(echo VERSION)"
+        run: echo "::set-output name=version::$(cat VERSION)"
 
       - name: Downgrade code for production (to PHP 7.0)
         run: |
           composer install
           vendor/bin/rector process
 
-      - name: Build project for production
-        run: |
-          composer install --no-dev --optimize-autoloader
-          mkdir build
+      - name: Validate composer.json and composer.lock
+        run: composer validate
+
+      - name: Get composer cache directory
+        id: composercache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composercache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer install --no-dev --optimize-autoloader
 
       - name: Create artifact
-        run: tar -xvjf build/friendica-full-${{ steps.release.outputs.version }}-legacy.tar.gz -T mods/release-list.txt
+        run: |
+          mkdir build
+          tar -cvjf build/friendica-full-${{ steps.release.outputs.version }}-legacy.tar.gz -T mods/release-list.txt
 
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
           name: friendica
-          path: build/build/friendica-full-${{ steps.release.outputs.version }}-legacy.tar.gz
+          path: build/friendica-full-${{ steps.release.outputs.version }}-legacy.tar.gz
 
 #      - name: Upload to release
 #        uses: JasonEtco/upload-to-release@master
diff --git a/rector.php b/rector.php
index 997e3ecd87..313f8c4342 100644
--- a/rector.php
+++ b/rector.php
@@ -17,7 +17,6 @@ return static function (ContainerConfigurator $containerConfigurator): void {
 		__DIR__ . '/mod',
 		__DIR__ . '/static',
 		__DIR__ . '/bin',
-		__DIR__ . '/addon',
 		__DIR__ . '/view',
 		__DIR__
 	]);