Compare commits
	
		
			7 Commits
		
	
	
		
			main
			...
			a0fac1cb69
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| a0fac1cb69 | |||
| e15689ef22 | |||
| 5313016312 | |||
| 2d29a61dfa | |||
| 7c8b44559d | |||
| 342a8b9e4d | |||
| 15c674fadf | 
| @@ -22,24 +22,24 @@ jobs: | |||||||
|           # remove the 'v' prefix from the tag name |           # remove the 'v' prefix from the tag name | ||||||
|           echo "BUILD_NAME=${LATEST_TAG//v}" >> $GITHUB_ENV |           echo "BUILD_NAME=${LATEST_TAG//v}" >> $GITHUB_ENV | ||||||
|  |  | ||||||
|   build-android: |   # build-android: | ||||||
|     name: Build and upload android app |   #   name: Build and upload android app | ||||||
|     uses: ./.gitea/workflows/workflow_build-app-android.yaml |   #   uses: ./.gitea/workflows/workflow_build-app-android.yaml | ||||||
|     with: |   #   with: | ||||||
|       build_type: beta |   #     build_type: release # for current testing | ||||||
|       build_name: ${{ env.BUILD_NAME }} |   #     build_name: ${{ env.BUILD_NAME }} | ||||||
|     secrets: |   #   secrets: | ||||||
|       ANDROID_SECRET_PROPERTIES_BASE64: ${{ secrets.ANDROID_SECRET_PROPERTIES_BASE64 }} |   #     ANDROID_SECRET_PROPERTIES_BASE64: ${{ secrets.ANDROID_SECRET_PROPERTIES_BASE64 }} | ||||||
|       ANDROID_GOOGLE_PLAY_JSON_BASE64: ${{ secrets.ANDROID_GOOGLE_PLAY_JSON_BASE64 }} |   #     ANDROID_GOOGLE_PLAY_JSON_BASE64: ${{ secrets.ANDROID_GOOGLE_PLAY_JSON_BASE64 }} | ||||||
|       ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }} |   #     ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }} | ||||||
|       ANDROID_GOOGLE_MAPS_API_KEY: ${{ secrets.ANDROID_GOOGLE_MAPS_API_KEY }} |   #     ANDROID_GOOGLE_MAPS_API_KEY: ${{ secrets.ANDROID_GOOGLE_MAPS_API_KEY }} | ||||||
|     needs: get-version |   #   needs: get-version | ||||||
|  |  | ||||||
|   build-ios: |   build-ios: | ||||||
|     name: Build and upload ios app |     name: Build and upload ios app | ||||||
|     uses: ./.gitea/workflows/workflow_build-app-ios.yaml |     uses: ./.gitea/workflows/workflow_build-app-ios.yaml | ||||||
|     with: |     with: | ||||||
|       build_type: beta |       build_type: release # for current testing | ||||||
|       build_name: ${{ env.BUILD_NAME }} |       build_name: ${{ env.BUILD_NAME }} | ||||||
|     secrets: |     secrets: | ||||||
|       IOS_ASC_KEY_ID: ${{ secrets.IOS_ASC_KEY_ID }} |       IOS_ASC_KEY_ID: ${{ secrets.IOS_ASC_KEY_ID }} | ||||||
| @@ -49,3 +49,5 @@ jobs: | |||||||
|       IOS_MATCH_PASSWORD: ${{ secrets.IOS_MATCH_PASSWORD }} |       IOS_MATCH_PASSWORD: ${{ secrets.IOS_MATCH_PASSWORD }} | ||||||
|       IOS_GOOGLE_MAPS_API_KEY: ${{ secrets.IOS_GOOGLE_MAPS_API_KEY }} |       IOS_GOOGLE_MAPS_API_KEY: ${{ secrets.IOS_GOOGLE_MAPS_API_KEY }} | ||||||
|     needs: get-version |     needs: get-version | ||||||
|  |  | ||||||
|  |     # needs: build-android # technically not needed, but this prevents the builds from running in parallel | ||||||
|   | |||||||
| @@ -43,7 +43,7 @@ jobs: | |||||||
|       IOS_ASC_KEY_ID: ${{ secrets.IOS_ASC_KEY_ID }} |       IOS_ASC_KEY_ID: ${{ secrets.IOS_ASC_KEY_ID }} | ||||||
|       IOS_ASC_ISSUER_ID: ${{ secrets.IOS_ASC_ISSUER_ID }} |       IOS_ASC_ISSUER_ID: ${{ secrets.IOS_ASC_ISSUER_ID }} | ||||||
|       IOS_ASC_KEY: ${{ secrets.IOS_ASC_KEY }} |       IOS_ASC_KEY: ${{ secrets.IOS_ASC_KEY }} | ||||||
|       IOS_MATCH_PASSWORD: ${{ secrets.IOS_MATCH_PASSWORD }} |  | ||||||
|       IOS_MATCH_REPO_SSH_KEY_BASE64: ${{ secrets.IOS_MATCH_REPO_SSH_KEY_BASE64 }} |       IOS_MATCH_REPO_SSH_KEY_BASE64: ${{ secrets.IOS_MATCH_REPO_SSH_KEY_BASE64 }} | ||||||
|  |       IOS_MATCH_PASSWORD: ${{ secrets.IOS_MATCH_PASSWORD }} | ||||||
|       IOS_GOOGLE_MAPS_API_KEY: ${{ secrets.IOS_GOOGLE_MAPS_API_KEY }} |       IOS_GOOGLE_MAPS_API_KEY: ${{ secrets.IOS_GOOGLE_MAPS_API_KEY }} | ||||||
|     needs: get-version |     needs: build-android # technically not needed, but this prevents the builds from running in parallel | ||||||
|   | |||||||
| @@ -53,9 +53,12 @@ jobs: | |||||||
|           ruby-version: 3.3 |           ruby-version: 3.3 | ||||||
|           bundler-cache: true # runs 'bundle install' and caches installed gems automatically |           bundler-cache: true # runs 'bundle install' and caches installed gems automatically | ||||||
|  |  | ||||||
|  |       - uses: GuillaumeFalourd/setup-rsync@v1.2 | ||||||
|  |  | ||||||
|       - name: Install dependencies and clean up |       - name: Install dependencies and clean up | ||||||
|         run: | |         run: | | ||||||
|           flutter pub get |           flutter pub get | ||||||
|  |           flutter precache --ios | ||||||
|           bundle exec pod install --allow-root |           bundle exec pod install --allow-root | ||||||
|           flutter clean |           flutter clean | ||||||
|           bundle exec pod cache clean --all --allow-root |           bundle exec pod cache clean --all --allow-root | ||||||
|   | |||||||
| Before Width: | Height: | Size: 3.0 MiB After Width: | Height: | Size: 3.0 MiB | 
| Before Width: | Height: | Size: 4.1 MiB After Width: | Height: | Size: 4.1 MiB | 
| Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.1 MiB | 
| Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.1 MiB | 
| @@ -32,7 +32,7 @@ platform :ios do | |||||||
|     sh( |     sh( | ||||||
|       "sed", |       "sed", | ||||||
|       "-i",  |       "-i",  | ||||||
|       "", |       "''", | ||||||
|       "s/IOS_GOOGLE_MAPS_API_KEY/#{ENV["IOS_GOOGLE_MAPS_API_KEY"]}/g",  |       "s/IOS_GOOGLE_MAPS_API_KEY/#{ENV["IOS_GOOGLE_MAPS_API_KEY"]}/g",  | ||||||
|       "../Runner/AppDelegate.swift" |       "../Runner/AppDelegate.swift" | ||||||
|     ) |     ) | ||||||
| @@ -78,7 +78,7 @@ platform :ios do | |||||||
|     sh( |     sh( | ||||||
|       "sed", |       "sed", | ||||||
|       "-i", |       "-i", | ||||||
|       "", |       "''", | ||||||
|       "s/IOS_GOOGLE_MAPS_API_KEY/#{ENV["IOS_GOOGLE_MAPS_API_KEY"]}/g", |       "s/IOS_GOOGLE_MAPS_API_KEY/#{ENV["IOS_GOOGLE_MAPS_API_KEY"]}/g", | ||||||
|       "../Runner/AppDelegate.swift" |       "../Runner/AppDelegate.swift" | ||||||
|     ) |     ) | ||||||
|   | |||||||