diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bd0a0b2..e983abc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,6 +3,15 @@ name: release on: workflow_dispatch: + inputs: + pre_release: + required: true + description: Create pre-release version, eq. 1.0.0-rc.0 + type: boolean + default: false + push: + branches: + - release jobs: release_tag: @@ -35,6 +44,10 @@ jobs: skip-git-pull: true # skip tag push - it will not push but it will tag git-push: false + # set to true to flag rc, eg 0.1.0-rc.0 + pre-release: ${{inputs.pre_release}} + # initial version if no tag present + fallback-version: 0.0.1 log_release_tag: needs: release_tag diff --git a/frontend/pages/admin/categories.tsx b/frontend/pages/admin/categories.tsx index 42a1e26..26ba64e 100644 --- a/frontend/pages/admin/categories.tsx +++ b/frontend/pages/admin/categories.tsx @@ -12,15 +12,17 @@ import AdminPageWithNav from '~/components/admin/AdminPageWithNav' import {adminPages} from '~/components/admin/AdminNav' import AdminCategories from '~/components/admin/categories' -const pageTitle = `${adminPages['categories'].title} | Admin page | ${app.title}` +// disable categories option, 2024-07-02 +// change this to categories when enabled +const pageTitle = `${adminPages['pages'].title} | Admin page | ${app.title}` export default function AdminCategoriesPage() { return ( {pageTitle} - - + pages + diff --git a/frontend/pages/admin/communities.tsx b/frontend/pages/admin/communities.tsx index 60d476c..4476fe8 100644 --- a/frontend/pages/admin/communities.tsx +++ b/frontend/pages/admin/communities.tsx @@ -15,6 +15,8 @@ import {SearchProvider} from '~/components/search/SearchContext' import {PaginationProvider} from '~/components/pagination/PaginationContext' import AdminCommunities from '~/components/admin/communities' +// disable communities option, 2024-07-02 +// change this to communities when enabled const pageTitle = `${adminPages['pages'].title} | Admin page | ${app.title}` const pagination = { @@ -36,7 +38,7 @@ export default function AdminCommunitiesPage() { {pageTitle} - + diff --git a/frontend/pages/admin/software-highlights.tsx b/frontend/pages/admin/software-highlights.tsx index 2fe8d3b..7701d06 100644 --- a/frontend/pages/admin/software-highlights.tsx +++ b/frontend/pages/admin/software-highlights.tsx @@ -13,7 +13,9 @@ import AdminPageWithNav from '~/components/admin/AdminPageWithNav' import {adminPages} from '~/components/admin/AdminNav' import AdminSoftwareHighlight from '~/components/admin/software-highlights/index' -const pageTitle = `${adminPages['organisations'].title} | Admin page | ${app.title}` +// disable softwareHighlights option, 2024-07-02 +// change this to softwareHighlights when enabled +const pageTitle = `${adminPages['pages'].title} | Admin page | ${app.title}` export default function AdminSoftwareHighlightsPage() { @@ -26,7 +28,7 @@ export default function AdminSoftwareHighlightsPage() { {pageTitle} - +