Release: merge development into beta

.github/workflows/beta-release.yaml

@@ -3,35 +3,31 @@ name: Beta Release
 on:
   push:
     branches:
-      - feature/newopenregister
-      # - beta
+      - beta
 
 jobs:
   release-management:
     runs-on: ubuntu-latest
     steps:
 
-      # Stap 1: Code ophalen
       - name: Checkout Code
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
           ssh-key: ${{ secrets.DEPLOY_KEY }}
 
-      # Stap 2: Stel de appnaam in (gebruik de repo-naam)
       - name: Set app env
         run: |
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
-      # Stap 3: Haal huidige versie uit info.xml, verhoog de patch en voeg beta-suffix toe
       - name: Get current version and append beta suffix
         id: increment_version
         run: |
           # Get version from main branch
           git fetch origin main
           main_version=$(git show origin/main:appinfo/info.xml | grep -oP '(?<=<version>)[^<]+' || echo "")
 
-          # Get current version from feature/newopenregister branch
+          # Get current version from current branch
           current_version=$(grep -oP '(?<=<version>)[^<]+' appinfo/info.xml || echo "")
 
           # Split main version into parts
@@ -43,7 +39,7 @@ jobs:
           # Extract beta counter from current version if it exists
           beta_counter=1
           if [[ $current_version =~ -beta\.([0-9]+)$ ]]; then
-            # If current patch version is still ahead of master, increment counter
+            # If current patch version is still ahead of main, increment counter
             current_patch=$(echo $current_version | grep -oP '^[0-9]+\.[0-9]+\.(\d+)' | cut -d. -f3)
             if [ "$current_patch" -eq "$next_patch" ]; then
               beta_counter=$((BASH_REMATCH[1] + 1))
@@ -58,44 +54,37 @@ jobs:
           echo "Current version: $current_version"
           echo "Using beta version: $beta_version"
 
-      # Stap 4: Update de versie in info.xml
       - name: Update version in info.xml
         run: |
           sed -i "s|<version>.*</version>|<version>${{ env.NEW_VERSION }}</version>|" appinfo/info.xml
 
-      # Stap 5: Commit de nieuwe versie (indien er wijzigingen zijn)
       - name: Commit version update
         run: |
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
           git commit -am "Bump beta version to ${{ env.NEW_VERSION }} [skip ci]"
           git push
 
-      # Stap 6: Bereid de signing certificaten voor
       - name: Prepare Signing Certificate and Key
         run: |
           echo "${{ secrets.NEXTCLOUD_SIGNING_CERT }}" > signing-cert.crt
           echo "${{ secrets.NEXTCLOUD_SIGNING_KEY }}" > signing-key.key
 
-      # Stap 7: Installeer npm dependencies
       - name: Install npm dependencies
         uses: actions/setup-node@v3
         with:
           node-version: '18.x'
 
-      # Stap 8: Stel PHP in en installeer benodigde extensies
       - name: Set up PHP and install extensions
         uses: shivammathur/setup-php@v2
         with:
           php-version: '8.2'
           extensions: zip, gd
 
-      # Stap 9: Voer npm install, build en composer install uit
       - run: npm ci
       - run: npm run build
       - run: composer install --no-dev
 
-      # Stap 10: Kopieer de bestanden naar de package directory
       - name: Copy the package files into the package
         run: |
           mkdir -p package/${{ github.event.repository.name }}
@@ -137,45 +126,39 @@ jobs:
             --exclude='.nvmrc' \
             ./ package/${{ github.event.repository.name }}/
 
-      # Stap 11: Maak het TAR.GZ archief
       - name: Create Tarball
         run: |
           cd package && tar -czf ../nextcloud-release.tar.gz ${{ github.event.repository.name }}
 
-      # Stap 12: Sign het TAR.GZ bestand met OpenSSL
       - name: Sign the TAR.GZ file with OpenSSL
         run: |
           openssl dgst -sha512 -sign signing-key.key nextcloud-release.tar.gz | openssl base64 -out nextcloud-release.signature
 
-      # Stap 13: Genereer Git versie informatie (optioneel, voor logging)
       - name: Git Version
         id: version
         uses: codacy/git-version@2.7.1
         with:
-          release-branch: feature/newopenregister
+          release-branch: beta
 
-      # Stap 14: Extraheer repository description (optioneel)
       - name: Extract repository description
         id: repo-description
         run: |
           description=$(jq -r '.description' <(curl -s https://api.github.com/repos/${{ github.repository }}))
           echo "REPO_DESCRIPTION=$description" >> $GITHUB_ENV
 
-      # Stap 15: Output de versie (voor logging)
       - name: Use the version
         run: |
           echo "Git Version info: ${{ steps.version.outputs.version }}"
 
-      # Stap 17: Maak een nieuwe GitHub release (als prerelease)
       - name: Upload Beta Release
         uses: ncipollo/release-action@v1.12.0
         with:
           tag: v${{ env.NEW_VERSION }}
           name: Beta Release ${{ env.NEW_VERSION }}
           draft: false
           prerelease: true
+          skipIfReleaseExists: true
 
-      # Stap 18: Voeg het tarball toe als asset aan de GitHub release
       - name: Attach tarball to GitHub release
         uses: svenstaro/upload-release-action@v2
         with:
@@ -185,7 +168,6 @@ jobs:
           tag: v${{ env.NEW_VERSION }}
           overwrite: true
 
-      # Stap 19: Upload de app naar de Nextcloud App Store
       - name: Upload app to Nextcloud appstore
         uses: nextcloud-releases/nextcloud-appstore-push-action@a011fe619bcf6e77ddebc96f9908e1af4071b9c1
         with:
@@ -195,7 +177,6 @@ jobs:
           app_private_key: ${{ secrets.NEXTCLOUD_SIGNING_KEY }}
           nightly: false
 
-      # Stap 20: Verifieer de release
       - name: Verify version and contents
         run: |
           echo "App version: ${{ env.NEW_VERSION }}"

.github/workflows/pr-check.yaml

@@ -0,0 +1,32 @@
+name: Branch Protection
+
+on:
+  pull_request:
+    branches:
+      - main
+      - beta
+
+jobs:
+  check-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check branch
+        run: |
+          TARGET="${{ github.base_ref }}"
+          SOURCE="${{ github.head_ref }}"
+
+          if [[ "$TARGET" == "main" ]]; then
+            if [[ "$SOURCE" != "beta" ]] && ! [[ "$SOURCE" =~ ^hotfix ]]; then
+              echo "Error: Pull requests to main must come from 'beta' or a branch starting with 'hotfix'"
+              echo "Source branch: $SOURCE"
+              exit 1
+            fi
+          elif [[ "$TARGET" == "beta" ]]; then
+            if [[ "$SOURCE" != "development" ]] && ! [[ "$SOURCE" =~ ^hotfix ]]; then
+              echo "Error: Pull requests to beta must come from 'development' or a branch starting with 'hotfix'"
+              echo "Source branch: $SOURCE"
+              exit 1
+            fi
+          fi
+
+          echo "Branch check passed: $SOURCE -> $TARGET"

.github/workflows/pull-request-from-branch-check.yaml

@@ -0,0 +1,32 @@
+name: Branch Protection
+
+on:
+  pull_request:
+    branches:
+      - main
+      - beta
+
+jobs:
+  check-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check branch
+        run: |
+          TARGET="${{ github.base_ref }}"
+          SOURCE="${{ github.head_ref }}"
+
+          if [[ "$TARGET" == "main" ]]; then
+            if [[ "$SOURCE" != "beta" ]] && ! [[ "$SOURCE" =~ ^hotfix ]]; then
+              echo "Error: Pull requests to main must come from 'beta' or a branch starting with 'hotfix'"
+              echo "Source branch: $SOURCE"
+              exit 1
+            fi
+          elif [[ "$TARGET" == "beta" ]]; then
+            if [[ "$SOURCE" != "development" ]] && ! [[ "$SOURCE" =~ ^hotfix ]]; then
+              echo "Error: Pull requests to beta must come from 'development' or a branch starting with 'hotfix'"
+              echo "Source branch: $SOURCE"
+              exit 1
+            fi
+          fi
+
+          echo "Branch check passed: $SOURCE -> $TARGET"

.github/workflows/pull-request-lint-check.yaml

@@ -0,0 +1,21 @@
+name: Lint Check
+
+on:
+  pull_request:
+    branches:
+      - development
+      - main
+
+jobs:
+  lint-check:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: npm i
+
+      - name: Linting
+        run: npm run lint

.github/workflows/push-development-to-beta.yaml

@@ -0,0 +1,44 @@
+name: Create PR to Beta
+
+permissions:
+  contents: write
+  pull-requests: write
+
+on:
+  push:
+    branches:
+      - development
+
+jobs:
+  create-pr:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Create or update PR to beta
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          # Check if beta branch exists
+          if ! git ls-remote --heads origin beta | grep -q beta; then
+            echo "Beta branch does not exist yet. Creating from development..."
+            git push origin origin/development:refs/heads/beta
+          fi
+
+          # Check if a PR already exists
+          EXISTING_PR=$(gh pr list --base beta --head development --state open --json number --jq '.[0].number' || echo "")
+
+          if [ -n "$EXISTING_PR" ] && [ "$EXISTING_PR" != "null" ]; then
+            echo "PR #$EXISTING_PR already exists, it will auto-update with new commits"
+          else
+            gh pr create \
+              --base beta \
+              --head development \
+              --title "Release: merge development into beta" \
+              --body "Automated PR to sync development changes to beta for beta release.
+
+          Merging this PR will trigger the beta release workflow."
+          fi