From 778b0f074313e7092ce41024887a0bcab998fa0e Mon Sep 17 00:00:00 2001 From: caxewsh Date: Tue, 17 Sep 2024 23:58:58 +0200 Subject: [PATCH 1/3] chore(homescreen): add version number --- components/reusable/VersionNumber.jsx | 13 +++++++++++++ package.json | 1 + screens/Homescreen.js | 2 ++ yarn.lock | 5 +++++ 4 files changed, 21 insertions(+) create mode 100644 components/reusable/VersionNumber.jsx diff --git a/components/reusable/VersionNumber.jsx b/components/reusable/VersionNumber.jsx new file mode 100644 index 0000000..4aa8f6d --- /dev/null +++ b/components/reusable/VersionNumber.jsx @@ -0,0 +1,13 @@ +import React from "react"; +import { View, Text } from "react-native"; +import * as Application from "expo-application"; + +const VersionNumber = () => { + return ( + + v{Application.nativeApplicationVersion} + + ); +}; + +export default VersionNumber; \ No newline at end of file diff --git a/package.json b/package.json index 25527c1..1333ca7 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "@supabase/supabase-js": "^2.45.3", "eas-cli": "^7.3.0", "expo": "^51.0.32", + "expo-application": "~5.9.1", "expo-asset": "~10.0.10", "expo-dev-client": "~4.0.26", "expo-status-bar": "~1.12.1", diff --git a/screens/Homescreen.js b/screens/Homescreen.js index 7243efe..dd43c60 100644 --- a/screens/Homescreen.js +++ b/screens/Homescreen.js @@ -8,6 +8,7 @@ import { useImage } from "../provider/ImageContext"; import Header from "../components/homescreen/Header"; import GifViewer from "../components/homescreen/GifViewer"; import StartButton from "../components/homescreen/StartButton"; +import VersionNumber from "../components/reusable/VersionNumber"; export default function HomeScreen() { @@ -30,6 +31,7 @@ export default function HomeScreen() {
+ ); diff --git a/yarn.lock b/yarn.lock index 5d2a9fe..01f8af4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5046,6 +5046,11 @@ execa@^5.0.0, execa@^5.1.1: signal-exit "^3.0.3" strip-final-newline "^2.0.0" +expo-application@~5.9.1: + version "5.9.1" + resolved "https://registry.yarnpkg.com/expo-application/-/expo-application-5.9.1.tgz#a12e0cf2741b6f084cc49cd0121ad0a70c770459" + integrity sha512-uAfLBNZNahnDZLRU41ZFmNSKtetHUT9Ua557/q189ua0AWV7pQjoVAx49E4953feuvqc9swtU3ScZ/hN1XO/FQ== + expo-asset@~10.0.10: version "10.0.10" resolved "https://registry.yarnpkg.com/expo-asset/-/expo-asset-10.0.10.tgz#9e6e02c1a6ec3d19b50d5e615e4dd8e5cc30e857" From bef288e91401bd7ba2306e8a833aa10f3a2ef36a Mon Sep 17 00:00:00 2001 From: caxewsh Date: Wed, 18 Sep 2024 01:18:38 +0200 Subject: [PATCH 2/3] bsr: add ci action to check commit --- .github/workflows/commitCheck.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/workflows/commitCheck.yml diff --git a/.github/workflows/commitCheck.yml b/.github/workflows/commitCheck.yml new file mode 100644 index 0000000..0cde1e2 --- /dev/null +++ b/.github/workflows/commitCheck.yml @@ -0,0 +1,14 @@ +name: gitleaks + +on: [pull_request, push, workflow_dispatch] +jobs: + scan: + name: gitleaks + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - uses: gitleaks/gitleaks-action@v2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From 648e3885c17d827844f98992fb9e49736d47758d Mon Sep 17 00:00:00 2001 From: caxewsh Date: Wed, 18 Sep 2024 01:24:42 +0200 Subject: [PATCH 3/3] bsr: fix snyk result in PR --- .github/workflows/securityCheck.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/securityCheck.yml b/.github/workflows/securityCheck.yml index c29b65d..dcc12a0 100644 --- a/.github/workflows/securityCheck.yml +++ b/.github/workflows/securityCheck.yml @@ -43,7 +43,6 @@ jobs: message: | ### 🛡️ Snyk Security Results ``` - ${{ env.SNYK_RESULT }} + ${{ steps.snyk.outputs.SNYK_RESULT }} ``` GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -