From 028815a7b6cbd079520894bc52fa71a13e4ff373 Mon Sep 17 00:00:00 2001
From: Divlo <contact@divlo.fr>
Date: Tue, 27 Jul 2021 21:01:33 +0200
Subject: [PATCH] fix: sign release commit and backmerge to develop

---
 .github/workflows/Divlo.yml         |  7 +++++++
 .releaserc.json                     |  8 +++++++-
 components/Footer.tsx               |  5 +----
 components/__test__/Footer.test.tsx | 19 ++-----------------
 package-lock.json                   | 27 +++++++++++++++++++++++++++
 package.json                        |  1 +
 6 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/Divlo.yml b/.github/workflows/Divlo.yml
index f509b1c..acadc38 100644
--- a/.github/workflows/Divlo.yml
+++ b/.github/workflows/Divlo.yml
@@ -95,6 +95,13 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
 
+      - name: 'Import GPG key'
+        uses: 'crazy-max/ghaction-import-gpg@v3.1.0'
+        with:
+          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
+          git-user-signingkey: true
+          git-commit-gpgsign: true
+
       - name: 'Use Node.js'
         uses: 'actions/setup-node@v2.3.0'
         with:
diff --git a/.releaserc.json b/.releaserc.json
index 50bcdb1..fc98f83 100644
--- a/.releaserc.json
+++ b/.releaserc.json
@@ -21,6 +21,12 @@
         "message": "chore(release): ${nextRelease.version} [skip ci]"
       }
     ],
-    "@semantic-release/github"
+    "@semantic-release/github",
+    [
+      "@saithodev/semantic-release-backmerge",
+      {
+        "backmergeStrategy": "merge"
+      }
+    ]
   ]
 }
diff --git a/components/Footer.tsx b/components/Footer.tsx
index 1058755..63c41ea 100644
--- a/components/Footer.tsx
+++ b/components/Footer.tsx
@@ -11,10 +11,7 @@ export const Footer: React.FC<FooterProps> = (props) => {
   const { version } = props
 
   const versionLink = useMemo(() => {
-    if (version !== '0.0.0-development') {
-      return `https://github.com/Divlo/Divlo/releases/tag/v${version}`
-    }
-    return 'https://github.com/Divlo/Divlo/tree/develop'
+    return `https://github.com/Divlo/Divlo/releases/tag/v${version}`
   }, [version])
 
   return (
diff --git a/components/__test__/Footer.test.tsx b/components/__test__/Footer.test.tsx
index 121ba3a..bcf8dbb 100644
--- a/components/__test__/Footer.test.tsx
+++ b/components/__test__/Footer.test.tsx
@@ -3,25 +3,10 @@ import { render } from '@testing-library/react'
 import { Footer } from '../Footer'
 
 describe('<Footer />', () => {
-  it('should render the version link pointing to the GitHub release', async () => {
+  it('should render', async () => {
     const version = '1.0.0'
     const { getByText } = render(<Footer version={version} />)
-    const versionLink = getByText(version) as HTMLAnchorElement
     expect(getByText('Divlo')).toBeInTheDocument()
-    expect(versionLink).toBeInTheDocument()
-    expect(versionLink.href).toEqual(
-      `https://github.com/Divlo/Divlo/releases/tag/v${version}`
-    )
-  })
-
-  it('should render the version link pointing to the `develop` branch', async () => {
-    const version = '0.0.0-development'
-    const { getByText } = render(<Footer version={version} />)
-    const versionLink = getByText(version) as HTMLAnchorElement
-    expect(getByText('Divlo')).toBeInTheDocument()
-    expect(versionLink).toBeInTheDocument()
-    expect(versionLink.href).toEqual(
-      'https://github.com/Divlo/Divlo/tree/develop'
-    )
+    expect(getByText(version)).toBeInTheDocument()
   })
 })
diff --git a/package-lock.json b/package-lock.json
index 17a0ccb..47124ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29,6 +29,7 @@
         "@commitlint/cli": "13.1.0",
         "@commitlint/config-conventional": "13.1.0",
         "@lhci/cli": "0.8.0",
+        "@saithodev/semantic-release-backmerge": "1.5.3",
         "@semantic-release/git": "9.0.0",
         "@testing-library/jest-dom": "5.14.1",
         "@testing-library/react": "12.0.0",
@@ -3709,6 +3710,19 @@
       "integrity": "sha512-Myxw//kzromB9yWgS8qYGuGVf91oBUUJpNvy5eM50sqvmKLbKjwLxohJnkWGTeeI9v9IBMtPLxz5Gc60FIfvCA==",
       "dev": true
     },
+    "node_modules/@saithodev/semantic-release-backmerge": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/@saithodev/semantic-release-backmerge/-/semantic-release-backmerge-1.5.3.tgz",
+      "integrity": "sha512-xgB7ikXe5ALh/w0px+L0ljE2H9pyZwgYVC244SaK0ZavCrxU9+YH7DBTBvMOIeM3BmCSkQh5ioNSUIwuk0SLOA==",
+      "dev": true,
+      "dependencies": {
+        "@semantic-release/error": "^2.2.0",
+        "aggregate-error": "^3.1.0",
+        "debug": "^4.3.1",
+        "execa": "^5.0.0",
+        "lodash": "^4.17.20"
+      }
+    },
     "node_modules/@semantic-release/commit-analyzer": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/@semantic-release/commit-analyzer/-/commit-analyzer-8.0.1.tgz",
@@ -27272,6 +27286,19 @@
       "integrity": "sha512-Myxw//kzromB9yWgS8qYGuGVf91oBUUJpNvy5eM50sqvmKLbKjwLxohJnkWGTeeI9v9IBMtPLxz5Gc60FIfvCA==",
       "dev": true
     },
+    "@saithodev/semantic-release-backmerge": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/@saithodev/semantic-release-backmerge/-/semantic-release-backmerge-1.5.3.tgz",
+      "integrity": "sha512-xgB7ikXe5ALh/w0px+L0ljE2H9pyZwgYVC244SaK0ZavCrxU9+YH7DBTBvMOIeM3BmCSkQh5ioNSUIwuk0SLOA==",
+      "dev": true,
+      "requires": {
+        "@semantic-release/error": "^2.2.0",
+        "aggregate-error": "^3.1.0",
+        "debug": "^4.3.1",
+        "execa": "^5.0.0",
+        "lodash": "^4.17.20"
+      }
+    },
     "@semantic-release/commit-analyzer": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/@semantic-release/commit-analyzer/-/commit-analyzer-8.0.1.tgz",
diff --git a/package.json b/package.json
index 36f3aad..0b10ed4 100644
--- a/package.json
+++ b/package.json
@@ -48,6 +48,7 @@
     "@commitlint/cli": "13.1.0",
     "@commitlint/config-conventional": "13.1.0",
     "@lhci/cli": "0.8.0",
+    "@saithodev/semantic-release-backmerge": "1.5.3",
     "@semantic-release/git": "9.0.0",
     "@testing-library/jest-dom": "5.14.1",
     "@testing-library/react": "12.0.0",