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 = (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('