Compare commits

..

6 Commits

Author SHA1 Message Date
Viktor Rådberg
7b0965c0dd test release 2024-01-13 19:40:36 +01:00
Viktor Rådberg
e55ea6a83a final test 2024-01-13 19:32:16 +01:00
Viktor Rådberg
481196de9b test 2024-01-13 19:30:42 +01:00
Viktor Rådberg
a136dbd3f9 test 2024-01-13 19:28:50 +01:00
Viktor Rådberg
8d23349dac test 2024-01-13 19:27:25 +01:00
Viktor Rådberg
a7caa46156 test 2024-01-13 19:22:31 +01:00
3 changed files with 37 additions and 31 deletions

View File

@@ -4,37 +4,43 @@ name: Deploy to Firebase Hosting
tags: tags:
- '*' - '*'
jobs: jobs:
# build_and_deploy: build_and_deploy:
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# env: env:
# REPO_READ_ACCESS_TOKEN: ${{ secrets.REPO_READ_ACCESS_TOKEN }} REPO_READ_ACCESS_TOKEN: ${{ secrets.REPO_READ_ACCESS_TOKEN }}
# steps: steps:
# - name: Checkout repository - name: Checkout repository
# uses: actions/checkout@v3 uses: actions/checkout@v3
# - name: Setup bun - name: Setup bun
# uses: oven-sh/setup-bun@v1 uses: oven-sh/setup-bun@v1
# - name: Build, lint, and deploy - name: Build, lint, and deploy
# run: | run: |
# bun install bun install
# bun run build bun run build
# bun run lint bun run lint
# - name: Deploy to Firebase Hosting - name: Deploy to Firebase Hosting
# uses: FirebaseExtended/action-hosting-deploy@v0 uses: FirebaseExtended/action-hosting-deploy@v0
# with: with:
# repoToken: '${{ secrets.GITHUB_TOKEN }}' repoToken: '${{ secrets.GITHUB_TOKEN }}'
# firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_LIFE_TRINKET }}' firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_LIFE_TRINKET }}'
# channelId: live channelId: live
# projectId: life-trinket projectId: life-trinket
release: release:
# needs: build_and_deploy needs: build_and_deploy
runs-on: ubuntu-latest runs-on: ubuntu-latest
env:
working-directory: ${{ github.workspace }}
steps: steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: get version - name: get version
id: version id: version
uses: notiz-dev/github-action-json-property@release uses: notiz-dev/github-action-json-property@v0.2.0
with: with:
path: 'package.json' path: 'package.json'
prop_path: 'version' prop_path: 'version'
@@ -46,7 +52,7 @@ jobs:
- name: Create Release - name: Create Release
uses: ncipollo/release-action@v1.13.0 uses: ncipollo/release-action@v1.13.0
with: with:
body: release_note.txt bodyFile: release_note.txt
commit: ${{ github.sha }} commit: ${{ github.sha }}
tag: '${{ steps.version.outputs.prop }}' tag: '${{ steps.version.outputs.prop }}'
token: ${{ secrets.RELEASE_TOKEN }} token: ${{ secrets.RELEASE_TOKEN }}

View File

@@ -1,7 +1,7 @@
{ {
"name": "life-trinket", "name": "life-trinket",
"private": true, "private": true,
"version": "0.5.2", "version": "0.5.41",
"type": "commonjs", "type": "commonjs",
"engines": { "engines": {
"node": ">=18", "node": ">=18",

View File

@@ -22,7 +22,7 @@ type SettingsModalProps = {
export const SettingsModal = ({ isOpen, closeModal }: SettingsModalProps) => { export const SettingsModal = ({ isOpen, closeModal }: SettingsModalProps) => {
const { settings, setSettings, isPWA } = useGlobalSettings(); const { settings, setSettings, isPWA } = useGlobalSettings();
const [isLatestVersion, setIsLatestVersion] = useState(false); const [isLatestVersion, setIsLatestVersion] = useState(false);
const newVersion = useRef<string | undefined>(undefined); const [newVersion, setNewVersion] = useState<string | undefined>(undefined);
useEffect(() => { useEffect(() => {
if (!isOpen) { if (!isOpen) {
@@ -45,13 +45,13 @@ export const SettingsModal = ({ isOpen, closeModal }: SettingsModalProps) => {
if (!data.name) { if (!data.name) {
setIsLatestVersion(false); setIsLatestVersion(false);
newVersion.current = undefined; setNewVersion(undefined);
return; return;
} }
/* @ts-expect-error is defined in vite.config.ts*/ /* @ts-expect-error is defined in vite.config.ts*/
if (data.name === APP_VERSION) { if (data.name === APP_VERSION) {
newVersion.current = data.name; setNewVersion(data.name);
setIsLatestVersion(true); setIsLatestVersion(true);
return; return;
} }
@@ -147,13 +147,13 @@ export const SettingsModal = ({ isOpen, closeModal }: SettingsModalProps) => {
<span className="text-sm text-text-secondary">(latest)</span> <span className="text-sm text-text-secondary">(latest)</span>
)} )}
</Paragraph> </Paragraph>
{!isLatestVersion && newVersion.current && ( {!isLatestVersion && newVersion && (
<Paragraph className="text-text-secondary text-lg text-center"> <Paragraph className="text-text-secondary text-lg text-center">
New version ({newVersion.current}) is available!{' '} New version ({newVersion}) is available!{' '}
</Paragraph> </Paragraph>
)} )}
</SettingContainer> </SettingContainer>
{!isLatestVersion && newVersion.current && ( {!isLatestVersion && newVersion && (
<Button <Button
variant="contained" variant="contained"
style={{ marginTop: '0.25rem', marginBottom: '0.25rem' }} style={{ marginTop: '0.25rem', marginBottom: '0.25rem' }}