Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test #499

Open
wants to merge 76 commits into
base: master
Choose a base branch
from
Open

test #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
1ac15ed
Capitalise loading albums and text in filter popup
JAicewizard Apr 10, 2024
df1b98a
Fix more capitalisation, and icon for no ordering
JAicewizard Apr 10, 2024
3d1705d
Remove unused variable
JAicewizard Apr 10, 2024
f357053
Test?
JAicewizard Apr 10, 2024
f8fc900
Sigh
JAicewizard May 2, 2024
cf01084
printttt
JAicewizard May 8, 2024
4e95309
more logs
JAicewizard May 8, 2024
56b8374
Don't call integrationDriver twice
JAicewizard May 8, 2024
fffb31e
Pls??
JAicewizard May 8, 2024
1bd1e84
dsa
JAicewizard May 8, 2024
3b1d10c
dfs
JAicewizard May 8, 2024
39a045d
SDfds
JAicewizard May 8, 2024
73a8c70
Remove tosti
JAicewizard May 8, 2024
fd0783f
Remove more
JAicewizard May 8, 2024
67ecff1
Another drop
JAicewizard May 8, 2024
89c7854
MOAR
JAicewizard May 8, 2024
b979241
MMOOOOAAAARRR
JAicewizard May 8, 2024
d73ae76
MMMMMMMMMOOOOOOOOOOAAAAAAAAARRRRRRRRRRR
JAicewizard May 8, 2024
1a9599b
Fix
JAicewizard May 8, 2024
6e96e63
AHAHAH
JAicewizard May 9, 2024
e536be3
Remove firebase_messaging
JAicewizard May 9, 2024
bd6c280
Does this work??
JAicewizard May 9, 2024
2779e66
dsa
JAicewizard May 9, 2024
287cf47
Remove more deps
JAicewizard May 9, 2024
ee61c09
Remove moar deps
JAicewizard May 9, 2024
4886817
Remove even more
JAicewizard May 9, 2024
c27e020
constantalbum??
JAicewizard May 9, 2024
5e83419
Remove Albumcubit
JAicewizard May 9, 2024
063c6d3
Remove repo things
JAicewizard May 10, 2024
e7cda89
plss
JAicewizard May 10, 2024
dc9c7cf
More
JAicewizard May 10, 2024
16c3811
More tests!
JAicewizard May 11, 2024
75cfed4
Remove unused code
JAicewizard May 11, 2024
ded05a2
Remove repositoryprovider
JAicewizard May 11, 2024
9a61f2b
Remove observers
JAicewizard May 11, 2024
e2ec451
Remoce concrexitrepo
JAicewizard May 11, 2024
a2e4bc7
Remove use of authcubit
JAicewizard May 11, 2024
fbab455
Stop using authcubit all together
JAicewizard May 11, 2024
d36e7a9
Remove all mocks
JAicewizard May 12, 2024
fdc6306
Remove api repo and filter_popup
JAicewizard May 12, 2024
978336e
Remove detailState
JAicewizard May 12, 2024
9cdb852
Remove auth cubit
JAicewizard May 12, 2024
861a95a
remove more routes
JAicewizard May 12, 2024
bc053e6
Remove album_tile
JAicewizard May 12, 2024
4d1f929
Remove gridview
JAicewizard May 12, 2024
c84f476
Make AlbumScreen stateless
JAicewizard May 13, 2024
1f73651
Remove album
JAicewizard May 13, 2024
19b24ab
Remove album_screen
JAicewizard May 13, 2024
b3a21f9
Remove the gallery
JAicewizard May 13, 2024
439b45e
Remove photo model
JAicewizard May 14, 2024
b4f72ed
Remove exceptions, list_response, & appbar
JAicewizard May 14, 2024
7d9f7e9
Remove theme
JAicewizard May 14, 2024
2d7eb37
Remove router all together
JAicewizard May 14, 2024
1271359
More removal
JAicewizard May 14, 2024
9ed26f8
Remove routes and config
JAicewizard May 14, 2024
5eda1c8
Remove intermediary widget
JAicewizard May 14, 2024
a0f9f9d
Remove widgetbingsings and device orientation
JAicewizard May 15, 2024
ed27ea9
Remove firebase-core
JAicewizard May 15, 2024
d7ade59
Remove cache and router
JAicewizard May 15, 2024
5a23666
Remove more deps
JAicewizard May 15, 2024
1c5bc38
Remove bloc
JAicewizard May 15, 2024
ad2486c
remove sentry and shared pref
JAicewizard May 15, 2024
dfcf6f1
Remove share wfhtml and share
JAicewizard May 16, 2024
fa1917d
Remove photo and path provider
JAicewizard May 16, 2024
0bb4e8b
Remove lots of deps
JAicewizard May 16, 2024
afe223c
Remove basically all deps
JAicewizard May 16, 2024
1426c0c
Re-add assets
JAicewizard May 17, 2024
fe7c99c
Remove screenshot code
JAicewizard May 17, 2024
12899ea
Update flutter
JAicewizard Jun 13, 2024
01ec912
Add verboseness to CI
JAicewizard Jun 14, 2024
f46893b
More logging
JAicewizard Jun 14, 2024
cd94bdd
Remove sleep
JAicewizard Jun 15, 2024
6422dcb
Add deeper logs
JAicewizard Jun 15, 2024
7776619
Patch flutter
JAicewizard Jun 15, 2024
814551e
Add more logging
JAicewizard Jun 15, 2024
130405e
Add more stacktrace logs
JAicewizard Aug 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
191 changes: 7 additions & 184 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,50 +8,9 @@ on:
- master

env:
FLUTTER_VERSION: 3.16.4
FLUTTER_VERSION: 3.22.2

jobs:
linting:
name: Linting
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Setup Flutter
uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
cache: true

- name: Flutter version
run: flutter --version

- name: Dart format
run: dart format --set-exit-if-changed .

- name: Flutter analyze
run: flutter analyze

testing:
name: Testing
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Setup Flutter
uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
cache: true

- name: Flutter version
run: flutter --version

- name: Flutter test
run: flutter test -r expanded

integration-ios:
name: Integration Testing - iOS
runs-on: macos-13
Expand All @@ -75,150 +34,14 @@ jobs:
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
cache: true
- name: Cache build files
uses: irgaly/xcode-cache@v1
with:
key: build-pubspec-${{ runner.os }}-${{ hashFiles('**/pubspec.lock') }}
restore-keys: |
build-pubspec-${{ runner.os }}
- name: Install Flutter dependencies
run: flutter pub get
- name: log
run: |
ls /Users/runner/hostedtoolcache/flutter/stable-3.22.2-x64
which flutter
sed -i.bak "s/_lastEffectiveTransform = transform;/_lastEffectiveTransform = transform;debugPrintStack(label: 'frame');print(transform);print(offset);print(_lastEffectiveTransform!.storage.every((double value) => value.isFinite));print(offset != Offset.zero);/" /Users/runner/hostedtoolcache/flutter/stable-3.22.2-x64/packages/flutter/lib/src/rendering/layer.dart
sed -i.bak "s/if (value == _transform) {/debugPrintStack(label: 'set transform');if (value == _transform) {/" /Users/runner/hostedtoolcache/flutter/stable-3.22.2-x64/packages/flutter/lib/src/rendering/layer.dart
- name: Run integration tests
run: |
flutter drive --driver=test_driver/integration_test.dart --target=integration_test/main.dart
- name: Upload Artifact
if: always()
uses: actions/upload-artifact@v4
with:
name: screenshots
path: screenshots

deploy-ios:
name: Deploy - iOS
needs: [linting, testing]
# Don't try multiple builds concurrently,
# because build numbers would conflict.
concurrency: deploy-ios
if: | # Don't deploy on draft PRs
github.event_name == 'workflow_dispatch'
|| (github.event_name == 'push' && github.ref == 'refs/heads/master')
|| (github.event_name == 'pull_request' && !github.event.pull_request.draft)
runs-on: macos-13
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Setup Flutter
uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
cache: true
- name: Cache build files
uses: irgaly/xcode-cache@v1
with:
key: build-pubspec-${{ runner.os }}-${{ hashFiles('**/pubspec.lock') }}
restore-keys: |
build-pubspec-${{ runner.os }}
- name: Flutter version
run: flutter --version

- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
ruby-version: 2.7.0

- name: Decode secrets
env:
APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }}
run: |
echo $APPLE_API_KEY | base64 --decode > $GITHUB_WORKSPACE/app-store.p8

- name: Build app
env:
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
KEYCHAIN_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
MATCH_GIT_PRIVATE_KEY: ${{ secrets.PASSWORDS_REPO_DEPLOY_KEY }}
THALIA_OAUTH_APP_ID: ${{ secrets.THALIA_OAUTH_APP_ID }}
THALIA_OAUTH_APP_SECRET: ${{ secrets.THALIA_OAUTH_APP_SECRET }}
TOSTI_API_HOST: ${{ vars.TOSTI_API_HOST }}
TOSTI_OAUTH_APP_ID: ${{ secrets.TOSTI_OAUTH_APP_ID }}
TOSTI_OAUTH_APP_SECRET: ${{ secrets.TOSTI_OAUTH_APP_SECRET }}
CHANGELOG: ${{ github.ref }}
run: bundle exec fastlane ios deploy_internal changelog:"$CHANGELOG"

deploy-android:
name: Deploy - Android
needs: [linting, testing]
# Don't try multiple builds concurrently,
# because build numbers would conflict.
concurrency: deploy-android
if: | # Don't deploy on draft PRs
github.event_name == 'workflow_dispatch'
|| (github.event_name == 'push' && github.ref == 'refs/heads/master')
|| (github.event_name == 'pull_request' && !github.event.pull_request.draft)
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Checkout passwords repo
uses: actions/checkout@v3
with:
repository: svthalia/ThaliApp-passwords
path: thaliapp-passwords
ssh-key: ${{ secrets.PASSWORDS_REPO_DEPLOY_KEY }}

- name: Decode secrets
env:
GOOGLE_PLAY_CONFIG: ${{ secrets.GOOGLE_PLAY_CONFIG_JSON }}
RELEASE_CONFIG_STORE_PASS: ${{ secrets.ANDROID_RELEASE_CONFIG_STORE_PASS }}
RELEASE_CONFIG_KEY_PASS: ${{ secrets.ANDROID_RELEASE_CONFIG_KEY_PASS }}
RELEASE_CONFIG_KEY_ALIAS: ${{ vars.ANDROID_RELEASE_CONFIG_KEY_ALIAS }}
run: |
echo $GOOGLE_PLAY_CONFIG > $GITHUB_WORKSPACE/google-play.json
echo "storeFile=$GITHUB_WORKSPACE/thaliapp-passwords/upload.keystore" > $GITHUB_WORKSPACE/android/key.properties
echo "storePassword=$RELEASE_CONFIG_STORE_PASS" >> $GITHUB_WORKSPACE/android/key.properties
echo "keyPassword=$RELEASE_CONFIG_KEY_PASS" >> $GITHUB_WORKSPACE/android/key.properties
echo "keyAlias=$RELEASE_CONFIG_KEY_ALIAS" >> $GITHUB_WORKSPACE/android/key.properties

- name: Setup JDK 17
uses: actions/setup-java@v3
with:
java-version: 17
distribution: zulu

- name: Setup Flutter
uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
cache: true

- name: Flutter version
run: flutter --version

- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
ruby-version: 2.7.0

- name: Gradle cache
uses: actions/cache@v3
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: |
${{ runner.os }}-gradle-

- name: Build app
env:
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
THALIA_OAUTH_APP_ID: ${{ secrets.THALIA_OAUTH_APP_ID }}
THALIA_OAUTH_APP_SECRET: ${{ secrets.THALIA_OAUTH_APP_SECRET }}
TOSTI_API_HOST: ${{ vars.TOSTI_API_HOST }}
TOSTI_OAUTH_APP_ID: ${{ secrets.TOSTI_OAUTH_APP_ID }}
TOSTI_OAUTH_APP_SECRET: ${{ secrets.TOSTI_OAUTH_APP_SECRET }}
SUPPLY_UPLOAD_MAX_RETRIES: ${{ vars.SUPPLY_UPLOAD_MAX_RETRIES }}
run: bundle exec fastlane android deploy_internal
5 changes: 0 additions & 5 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,6 @@
android:scheme="nu.thalia"/>
</intent-filter>
</activity>
<!-- Image Cropper -->
<activity
android:name="com.yalantis.ucrop.UCropActivity"
android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
<!-- Don't delete the meta-data below.
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
<meta-data
Expand Down
Binary file removed assets/album_placeholder.xcf
Binary file not shown.
Binary file removed assets/google_fonts/OpenSans-Bold.ttf
Binary file not shown.
Binary file removed assets/google_fonts/OpenSans-BoldItalic.ttf
Binary file not shown.
Binary file removed assets/google_fonts/OpenSans-ExtraBold.ttf
Binary file not shown.
Binary file removed assets/google_fonts/OpenSans-ExtraBoldItalic.ttf
Binary file not shown.
Binary file not shown.
Binary file removed assets/google_fonts/OpenSans-Italic.ttf
Binary file not shown.
Binary file removed assets/google_fonts/OpenSans-Light.ttf
Binary file not shown.
Binary file removed assets/google_fonts/OpenSans-LightItalic.ttf
Binary file not shown.
Binary file removed assets/google_fonts/OpenSans-Medium.ttf
Binary file not shown.
Binary file removed assets/google_fonts/OpenSans-MediumItalic.ttf
Binary file not shown.
93 changes: 0 additions & 93 deletions assets/google_fonts/OpenSans-OFL.txt

This file was deleted.

Binary file removed assets/google_fonts/OpenSans-Regular.ttf
Binary file not shown.
Binary file removed assets/google_fonts/OpenSans-SemiBold.ttf
Binary file not shown.
Binary file removed assets/google_fonts/OpenSans-SemiBoldItalic.ttf
Binary file not shown.
Binary file not shown.
Binary file removed assets/google_fonts/Oswald-Bold.ttf
Binary file not shown.
Binary file removed assets/google_fonts/Oswald-ExtraLight.ttf
Binary file not shown.
Binary file removed assets/google_fonts/Oswald-Light.ttf
Binary file not shown.
Binary file removed assets/google_fonts/Oswald-Medium.ttf
Binary file not shown.
Loading
Loading