From a988be7431dd176bdfacea5a5bcdde4489ed1ddb Mon Sep 17 00:00:00 2001
From: rugk <rugk+git@posteo.de>
Date: Wed, 6 Oct 2021 20:13:09 +0200
Subject: [PATCH 1/2] 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
---
 .github/workflows/refresh-php8.yml | 40 ++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 .github/workflows/refresh-php8.yml

diff --git a/.github/workflows/refresh-php8.yml b/.github/workflows/refresh-php8.yml
new file mode 100644
index 00000000..bf43df45
--- /dev/null
+++ b/.github/workflows/refresh-php8.yml
@@ -0,0 +1,40 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Refresh PHP 8 branch
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  push:
+    branches: [ master ]
+    
+  schedule:
+      - cron: '42 2 * * *'  
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+
+      - name: Checkout php8 branch 
+        run: git checkout php8
+
+      - name: Merge master changes into php8
+        run: git merge master
+      
+      - name: Push new changes
+        uses: github-actions-x/commit@v2.8
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          push-branch: 'php8'
+

From c7cd450f9b71eb7df1b4d70dd84be54b5bd83f2d Mon Sep 17 00:00:00 2001
From: rugk <rugk+git@posteo.de>
Date: Wed, 6 Oct 2021 20:19:03 +0200
Subject: [PATCH 2/2] Remove useless boilerplate comments

---
 .github/workflows/refresh-php8.yml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/.github/workflows/refresh-php8.yml b/.github/workflows/refresh-php8.yml
index bf43df45..5160e227 100644
--- a/.github/workflows/refresh-php8.yml
+++ b/.github/workflows/refresh-php8.yml
@@ -1,29 +1,17 @@
-# This is a basic workflow to help you get started with Actions
-
 name: Refresh PHP 8 branch
 
-# Controls when the workflow will run
 on:
-  # Triggers the workflow on push or pull request events but only for the master branch
   push:
-    branches: [ master ]
-    
+    branches: [ master ]    
   schedule:
       - cron: '42 2 * * *'  
-
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
   build:
-    # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
 
       - name: Checkout php8 branch