Merge pull request #586 from Adyen/develop

Single branch release and development (#585)

.github/workflows/gh_release.yml

@@ -1,16 +1,20 @@
-name: Github Release
+name: Automatic Github release
 
 on:
-    workflow_dispatch:
-    push:
-      branches:
-        - main
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+    paths:
+      - VERSION
 
 jobs:
-  gh_release:
+  github:
     permissions:
       contents: write
-    uses: Adyen/adyen-node-api-library/.github/workflows/lib-gh-release.yml@develop
+    uses: Adyen/release-automation-action/.github/workflows/reusable-github-release.yml@v1.1.1
     with:
-      project-name: PHP
-    secrets: inherit
+      release-title: Adyen PHP API Library
+      develop-branch: main
+    secrets:
+      token: ${{ secrets.ADYEN_AUTOMATION_BOT_ACCESS_TOKEN }}

.github/workflows/models.yml

@@ -31,7 +31,7 @@ jobs:
           token: ${{ secrets.ADYEN_AUTOMATION_BOT_ACCESS_TOKEN }}
           committer: ${{ secrets.ADYEN_AUTOMATION_BOT_EMAIL }}
           author: ${{ secrets.ADYEN_AUTOMATION_BOT_EMAIL }}
-          base: develop
+          base: main
           branch: automation/models
           title: ${{ steps.vars.outputs.pr_title }}
           body: ${{ steps.vars.outputs.pr_body }}

.github/workflows/release.yml

@@ -0,0 +1,32 @@
+name: Prepare release
+
+on:
+  workflow_dispatch:
+    inputs:
+      pre-release:
+        required: false
+        type: boolean
+        default: false
+        description: "This release will be labeled as non-production ready"
+  pull_request:
+    types:
+      - closed
+    branches:
+      - main
+
+jobs:
+  candidate:
+    if: github.event_name == 'workflow_dispatch' || (github.event.pull_request.merged && !startsWith(github.head_ref, 'promote/'))
+    permissions:
+      contents: write
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Prepare the next main release
+        uses: Adyen/[email protected]
+        with:
+          token: ${{ secrets.ADYEN_AUTOMATION_BOT_ACCESS_TOKEN }}
+          develop-branch: main
+          version-files: src/Adyen/Client.php README.md
+          pre-release: ${{ inputs.pre-release || false }}

.github/workflows/services.yml

@@ -31,7 +31,7 @@ jobs:
           token: ${{ secrets.ADYEN_AUTOMATION_BOT_ACCESS_TOKEN }}
           committer: ${{ secrets.ADYEN_AUTOMATION_BOT_EMAIL }}
           author: ${{ secrets.ADYEN_AUTOMATION_BOT_EMAIL }}
-          base: develop
+          base: main
           branch: automation/services
           title: ${{ steps.vars.outputs.pr_title }}
           body: ${{ steps.vars.outputs.pr_body }}

Makefile

@@ -136,13 +136,4 @@ clean:
 	git checkout $(models)
 	git clean -f -d $(models)
 
-
-## Releases
-
-version:
-	perl -lne 'print "currentVersion=$$1" if /LIB_VERSION = "(.+)";/' < src/Adyen/Client.php >> "$$GITHUB_OUTPUT"
-
-bump:
-	perl -i -pe 's/$$ENV{"CURRENT_VERSION"}/$$ENV{"NEXT_VERSION"}/' src/Adyen/Client.php
-
-.PHONY: templates models $(services) version bump
+.PHONY: templates models $(services)

README.md

@@ -4,7 +4,7 @@
 
 This is the officially supported PHP library for using Adyen's APIs.
 
-[![version](https://img.shields.io/badge/version-14.0.1-blue.svg)](https://docs.adyen.com/development-resources/libraries)
+[![version](https://img.shields.io/badge/version-16.0.0-blue.svg)](https://docs.adyen.com/development-resources/libraries)
 
 ## Supported API versions
 The library supports all APIs under the following services:

VERSION

@@ -0,0 +1 @@
+16.0.0