Skip to content

Commit

Permalink
Merge branch 'develop' into feat/app-icons
Browse files Browse the repository at this point in the history
Signed-off-by: Robert Eggl <[email protected]>
  • Loading branch information
Robert27 authored Jan 16, 2025
2 parents 92b4270 + e5e4d83 commit 7d7beed
Show file tree
Hide file tree
Showing 26 changed files with 794 additions and 495 deletions.
44 changes: 44 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: CI - ESLint, Prettier, Jest, and Codecov
on:
push:
branches: [develop, main]
pull_request:
branches: [develop, main]
jobs:
test:
name: Run tests and collect coverage
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up Bun
uses: oven-sh/setup-bun@v2

- name: Install dependencies
run: bun install --frozen-lockfile

- name: Run ESLint
run: bunx eslint . --ext .js,.jsx,.ts,.tsx

- name: Run Prettier
run: bunx prettier . --check

- name: Run tests
run: bunx jest --coverage --reporters=jest-junit

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v5
with:
directory: ${{ github.action_path }}
token: ${{ secrets.CODECOV_TOKEN }}
slug: getsentry/self-hosted

- name: Upload test results to Codecov
if: ${{ !cancelled() }}
uses: codecov/test-results-action@v1
with:
directory: ${{ github.action_path }}
token: ${{ secrets.CODECOV_TOKEN }}
18 changes: 0 additions & 18 deletions .github/workflows/lint.yml

This file was deleted.

18 changes: 0 additions & 18 deletions .github/workflows/prettier.yml

This file was deleted.

4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,6 @@ credentials/
# The following patterns were generated by expo-cli

expo-env.d.ts
# @end expo-cli
# @end expo-cli

coverage/**/*
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ android {
applicationId 'app.neuland'
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 275
versionCode 279
versionName "0.11.2"
}
signingConfigs {
Expand Down
2 changes: 1 addition & 1 deletion app.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"android": {
"package": "app.neuland",
"userInterfaceStyle": "automatic",
"versionCode": 275
"versionCode": 279
},
"sdkVersion": "52.0.0",
"experiments": {
Expand Down
Binary file modified bun.lockb
Binary file not shown.
10 changes: 10 additions & 0 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
coverage:
status:
project: #add everything under here, more options at https://docs.codecov.com/docs/commit-status
default:
# basic
target: auto #default
threshold: 0%
base: auto
comment:
enabled: true
2 changes: 1 addition & 1 deletion docs/.vitepress/config/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const de = defineConfig({
footer: {
message:
'<a href="/legal/imprint">Impressum</a> & <a href="/legal/privacy">Datenschutz</a>',
copyright: "Copyright © 2024 Neuland Ingolstadt e.V.",
copyright: "Copyright © 2025 Neuland Ingolstadt e.V.",
},
sidebar: {
"/app/": { base: "/app/", items: sidebarApp() },
Expand Down
2 changes: 1 addition & 1 deletion docs/.vitepress/config/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const en = defineConfig({
footer: {
message:
'<a href="/legal/imprint">Imprint</a> & <a href="/legal/privacy">Privacy</a>',
copyright: "Copyright © 2024 Neuland Ingolstadt e.V.",
copyright: "Copyright © 2025 Neuland Ingolstadt e.V.",
},
sidebar: {
"/en/app/": { base: "/en/app/", items: sidebarApp() },
Expand Down
10 changes: 8 additions & 2 deletions ios/NeulandNext.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,10 @@
LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\"";
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "$(inherited) ";
OTHER_LDFLAGS = (
"$(inherited)",
" ",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
Expand Down Expand Up @@ -663,7 +666,10 @@
);
LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\"";
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_LDFLAGS = "$(inherited) ";
OTHER_LDFLAGS = (
"$(inherited)",
" ",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
Expand Down
Loading

0 comments on commit 7d7beed

Please sign in to comment.