Merge pull request #1159 from Adyen/automation/release

Release v14.0.0

Author: AdyenAutomationBot

.eslintrc.js

@@ -1,27 +1,8 @@
-/*
- *                       ######
- *                       ######
- * ############    ####( ######  #####. ######  ############   ############
- * #############  #####( ######  #####. ######  #############  #############
- *        ######  #####( ######  #####. ######  #####  ######  #####  ######
- * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
- * ###### ######  #####( ######  #####. ######  #####          #####  ######
- * #############  #############  #############  #############  #####  ######
- *  ############   ############  #############   ############  #####  ######
- *                                      ######
- *                               #############
- *                               ############
- * Adyen NodeJS API Library
- * Copyright (c) 2020 Adyen B.V.
- * This file is open source and available under the MIT license.
- * See the LICENSE file for more info.
- */
-
 const path = require('path');
 
 module.exports = {
   parser: "@typescript-eslint/parser",
-  plugins: ["@typescript-eslint"],
+  plugins: ["@typescript-eslint", "unused-imports"],
   env: {
     es6: true,
     node: true
@@ -51,7 +32,8 @@ module.exports = {
           "{}": false
         }
       }
-    ]
+    ],
+    "unused-imports/no-unused-imports": "warn",
   },
   overrides: [
     {

.github/CODEOWNERS

@@ -1 +1 @@
-* @Adyen/api-libraries-reviewers
+* @Adyen/integration-tools-testing

.github/scripts/release.js renamed to .github/scripts/release.js.1

@@ -1,22 +1,38 @@
-// Get the current version of a Node.js package
-exports.packageVersion = () => {
-  return require('../../package.json').version;
-};
-
 // List of merged pull requests in Markdown
 exports.changelog = (changeset) => {
-  let entries = [];
+  let entries = new Set();
+
   for (const { node: { associatedPullRequests: prs } } of changeset.repository.ref.compare.commits.edges) {
     for (const { node: { number: number } } of prs.edges) {
-      entries.push(`- #${number}`);
+      entries.add(number);
     }
   }
-  return entries;
+
+  return Array.from(entries).sort((a, b) => a - b).map(pr => `- #${pr}`);
 };
 
 // Next semantic version number
-exports.nextVersion = (current, increment) => {
+exports.nextVersion = (current, increment, preRelease) => {
   let [major, minor, patch] = current.split('.');
+  let [unstaged, stage] = current.split('-');
+  preRelease = preRelease === "true";
+
+  // end pre-release
+  if (!preRelease && stage) {
+    return unstaged;
+  }
+
+  // bump pre-release
+  if (preRelease && stage) {
+    let [_, stageVersion] = stage.split('.');
+    stageVersion = parseInt(stageVersion);
+    if (isNaN(stageVersion)) {
+      stageVersion = 0;
+    }
+    stageVersion++;
+    return `${unstaged}-beta.${stageVersion}`;
+  }
+
   switch (increment) {
     case 'patch':
       patch++;
@@ -31,7 +47,15 @@ exports.nextVersion = (current, increment) => {
       patch = 0;
       break;
   }
-  return [major, minor, patch].join('.');
+
+  let version = [major, minor, patch].join('.');
+
+  // start pre-release
+  if (preRelease && !stage) {
+    return `${version}-beta`;
+  }
+
+  return version;
 };
 
 // Compare two branches on Github
@@ -65,7 +89,7 @@ exports.compareBranches = async (github, { owner, repo, base, head }) => {
             }
           }
         }
-    } 
+    }
     `, { owner, repo, base, head });
 }
 
@@ -78,7 +102,7 @@ exports.detectChanges = (changeset) => {
 
   let increment = 'patch';
 
-  // increment based on the merged PR labels  
+  // increment based on the merged PR labels
   for (const { node: { associatedPullRequests: prs } } of changeset.repository.ref.compare.commits.edges) {
     for (const { node: { labels: { nodes: labels } } } of prs.edges) {
       for (const { name: label } of labels) {
@@ -99,7 +123,7 @@ exports.detectChanges = (changeset) => {
 };
 
 // Define next release
-exports.bump = async ({ github, context, core, getCurrentVersion }) => {
+exports.bump = async ({ github, context, core }) => {
   const changeset = await this.compareBranches(github, {
     owner: context.repo.owner,
     repo: context.repo.repo,
@@ -108,9 +132,9 @@ exports.bump = async ({ github, context, core, getCurrentVersion }) => {
   });
   const changelog = this.changelog(changeset);
   const increment = this.detectChanges(changeset);
-  const nextVersion = this.nextVersion(getCurrentVersion(), increment);
+  const nextVersion = this.nextVersion(process.env.CURRENT_VERSION, increment, process.env.PRE_RELEASE);
 
   core.setOutput('increment', increment);
   core.setOutput('nextVersion', nextVersion);
   core.setOutput('changelog', changelog.join("\n"));
-};
+};

.github/scripts/release.test.js

@@ -1,6 +1,6 @@
 // deps='octokit @actions/core'; npm install -g $deps && npm link $deps
 // node --test .github/scripts/
-const test = require('node:test');
+const { test, beforeEach } = require('node:test');
 const assert = require('node:assert/strict');
 const { Octokit } = require("octokit");
 const core = require("@actions/core");
@@ -25,6 +25,27 @@ const comparisonFixture = {
         "aheadBy": 8,
         "commits": {
           "edges": [
+            {
+              "node": {
+                "message": "Another commit in the same PR non squashed",
+                "associatedPullRequests": {
+                  "edges": [
+                    {
+                      "node": {
+                        "number": 20,
+                        "labels": {
+                          "nodes": [
+                            {
+                              "name": "Breaking change"
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            },
             {
               "node": {
                 "message": "Fixing the constructor",
@@ -91,6 +112,11 @@ const comparisonFixture = {
   }
 };
 
+beforeEach(() => {
+  // Reset env variables
+  delete process.env.CURRENT_VERSION;
+  delete process.env.PRE_RELEASE;
+});
 
 test('Changelog', t => {
   const changelog = release.changelog(comparisonFixture);
@@ -132,12 +158,6 @@ test('Detect changes', async t => {
   });
 });
 
-test('Node.js package version', t => {
-  const version = release.packageVersion();
-
-  assert.ok(version);
-});
-
 test('Get next version', async t => {
   await t.test('Major', async t => {
     const ver = release.nextVersion('13.1.2', 'major');
@@ -162,6 +182,30 @@ test('Get next version', async t => {
 
     assert.strictEqual(ver, '1.2.3');
   });
+
+  await t.test('Start pre-release', async t => {
+    const ver = release.nextVersion('14.1.5', 'major', 'true');
+
+    assert.strictEqual(ver, '15.0.0-beta');
+  });
+
+  await t.test('Bump first pre-release', async t => {
+    const ver = release.nextVersion('15.0.0-beta', 'minor', 'true');
+
+    assert.strictEqual(ver, '15.0.0-beta.1');
+  });
+
+  await t.test('Bump second pre-release', async t => {
+    const ver = release.nextVersion('15.0.0-beta.1', 'patch', 'true');
+
+    assert.strictEqual(ver, '15.0.0-beta.2');
+  });
+
+  await t.test('End pre-release', async t => {
+    const ver = release.nextVersion('15.0.0-beta', 'major', 'false');
+
+    assert.strictEqual(ver, '15.0.0');
+  });
 });
 
 test('Compare branches', async t => {
@@ -179,8 +223,8 @@ test('Compare branches', async t => {
 test('Bump', async t => {
   t.mock.method(github, 'graphql', () => comparisonFixture);
   t.mock.method(core, 'setOutput', t.mock.fn());
-  const currentVersion = () => '1.2.3';
-  const options = { github, context, core, getCurrentVersion: currentVersion };
+  process.env.CURRENT_VERSION = '1.2.3';
+  const options = { github, context, core };
 
   await release.bump(options);
 

.github/workflows/gh-release.yml

@@ -1,37 +1,16 @@
 name: Github Release
 
 on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
+    workflow_dispatch:
+    push:
+      branches:
+        - main
 
 jobs:
   gh_release:
     permissions:
       contents: write
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.ADYEN_AUTOMATION_BOT_ACCESS_TOKEN }}
-      - name: Grab version
-        uses: actions/github-script@v6
-        id: release
-        with:
-          script: |
-            const release = require('./.github/scripts/release.js')
-            core.setOutput('version', release.packageVersion())
-      - name: Create new release
-        env:
-          GH_TOKEN: ${{ secrets.ADYEN_AUTOMATION_BOT_ACCESS_TOKEN }}
-        run: |
-          gh release create v${{steps.release.outputs.version}} \
-            --title 'Adyen Node API Library v${{steps.release.outputs.version}}' \
-            --generate-notes --target main
-      - name: Update develop branch
-        run: |
-          git checkout develop
-          git merge main
-          git push origin develop
+    uses: ./.github/workflows/lib-gh-release.yml
+    with:
+      project-name: Node
+    secrets: inherit

.github/workflows/lib-gh-release.yml

@@ -0,0 +1,34 @@
+on:
+  workflow_call:
+    inputs:
+      project-name:
+        required: true
+        type: string
+
+jobs:
+  gh_release:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.ADYEN_AUTOMATION_BOT_ACCESS_TOKEN }}
+      - name: Grab current version
+        id: current-version
+        run: make version
+      - name: Create new release
+        env:
+          GH_TOKEN: ${{ secrets.ADYEN_AUTOMATION_BOT_ACCESS_TOKEN }}
+          CURRENT_VERSION: ${{steps.current-version.outputs.currentVersion}}
+        run: |
+          prerelease=$(node -pe "process.env.CURRENT_VERSION.includes('-') ? '--prerelease' : ''")
+          gh release create "v${CURRENT_VERSION}" \
+            --title "Adyen ${{ inputs.project-name }} API Library v${CURRENT_VERSION}" \
+            --generate-notes $prerelease --target main
+      - name: Update develop branch
+        run: |
+          git checkout develop
+          git merge origin/main
+          git push origin develop