1
1
mirror of https://github.com/theoludwig/theoludwig.git synced 2024-12-08 00:44:30 +01:00

fix: sign release commit and backmerge to develop

This commit is contained in:
Divlo 2021-07-27 21:01:33 +02:00
parent a2ad591d6d
commit 028815a7b6
No known key found for this signature in database
GPG Key ID: 6F24DA54DA3967CF
6 changed files with 45 additions and 22 deletions

View File

@ -95,6 +95,13 @@ jobs:
fetch-depth: 0 fetch-depth: 0
persist-credentials: false 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' - name: 'Use Node.js'
uses: 'actions/setup-node@v2.3.0' uses: 'actions/setup-node@v2.3.0'
with: with:

View File

@ -21,6 +21,12 @@
"message": "chore(release): ${nextRelease.version} [skip ci]" "message": "chore(release): ${nextRelease.version} [skip ci]"
} }
], ],
"@semantic-release/github" "@semantic-release/github",
[
"@saithodev/semantic-release-backmerge",
{
"backmergeStrategy": "merge"
}
]
] ]
} }

View File

@ -11,10 +11,7 @@ export const Footer: React.FC<FooterProps> = (props) => {
const { version } = props const { version } = props
const versionLink = useMemo(() => { 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/releases/tag/v${version}`
}
return 'https://github.com/Divlo/Divlo/tree/develop'
}, [version]) }, [version])
return ( return (

View File

@ -3,25 +3,10 @@ import { render } from '@testing-library/react'
import { Footer } from '../Footer' import { Footer } from '../Footer'
describe('<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 version = '1.0.0'
const { getByText } = render(<Footer version={version} />) const { getByText } = render(<Footer version={version} />)
const versionLink = getByText(version) as HTMLAnchorElement
expect(getByText('Divlo')).toBeInTheDocument() expect(getByText('Divlo')).toBeInTheDocument()
expect(versionLink).toBeInTheDocument() expect(getByText(version)).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'
)
}) })
}) })

27
package-lock.json generated
View File

@ -29,6 +29,7 @@
"@commitlint/cli": "13.1.0", "@commitlint/cli": "13.1.0",
"@commitlint/config-conventional": "13.1.0", "@commitlint/config-conventional": "13.1.0",
"@lhci/cli": "0.8.0", "@lhci/cli": "0.8.0",
"@saithodev/semantic-release-backmerge": "1.5.3",
"@semantic-release/git": "9.0.0", "@semantic-release/git": "9.0.0",
"@testing-library/jest-dom": "5.14.1", "@testing-library/jest-dom": "5.14.1",
"@testing-library/react": "12.0.0", "@testing-library/react": "12.0.0",
@ -3709,6 +3710,19 @@
"integrity": "sha512-Myxw//kzromB9yWgS8qYGuGVf91oBUUJpNvy5eM50sqvmKLbKjwLxohJnkWGTeeI9v9IBMtPLxz5Gc60FIfvCA==", "integrity": "sha512-Myxw//kzromB9yWgS8qYGuGVf91oBUUJpNvy5eM50sqvmKLbKjwLxohJnkWGTeeI9v9IBMtPLxz5Gc60FIfvCA==",
"dev": true "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": { "node_modules/@semantic-release/commit-analyzer": {
"version": "8.0.1", "version": "8.0.1",
"resolved": "https://registry.npmjs.org/@semantic-release/commit-analyzer/-/commit-analyzer-8.0.1.tgz", "resolved": "https://registry.npmjs.org/@semantic-release/commit-analyzer/-/commit-analyzer-8.0.1.tgz",
@ -27272,6 +27286,19 @@
"integrity": "sha512-Myxw//kzromB9yWgS8qYGuGVf91oBUUJpNvy5eM50sqvmKLbKjwLxohJnkWGTeeI9v9IBMtPLxz5Gc60FIfvCA==", "integrity": "sha512-Myxw//kzromB9yWgS8qYGuGVf91oBUUJpNvy5eM50sqvmKLbKjwLxohJnkWGTeeI9v9IBMtPLxz5Gc60FIfvCA==",
"dev": true "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": { "@semantic-release/commit-analyzer": {
"version": "8.0.1", "version": "8.0.1",
"resolved": "https://registry.npmjs.org/@semantic-release/commit-analyzer/-/commit-analyzer-8.0.1.tgz", "resolved": "https://registry.npmjs.org/@semantic-release/commit-analyzer/-/commit-analyzer-8.0.1.tgz",

View File

@ -48,6 +48,7 @@
"@commitlint/cli": "13.1.0", "@commitlint/cli": "13.1.0",
"@commitlint/config-conventional": "13.1.0", "@commitlint/config-conventional": "13.1.0",
"@lhci/cli": "0.8.0", "@lhci/cli": "0.8.0",
"@saithodev/semantic-release-backmerge": "1.5.3",
"@semantic-release/git": "9.0.0", "@semantic-release/git": "9.0.0",
"@testing-library/jest-dom": "5.14.1", "@testing-library/jest-dom": "5.14.1",
"@testing-library/react": "12.0.0", "@testing-library/react": "12.0.0",