diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index e91a31de..4ccea5d3 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -26,7 +26,7 @@ jobs: echo "$(( ${{ secrets.DEV_ENV_FILE_CONTENT }} + 67 ))" > .env shell: bash - - uses: reasje/action-flutter-build-android@main + - uses: sheenhx/action-flutter-build-android@main with: keystore-base64: ${{ secrets.ANDROID_RELEASE_KEY }} keystore-password: "${{ secrets.ANDROID_RELEASE_KEY_PASSWORD }}" @@ -52,117 +52,117 @@ jobs: source-dir: build/app/outputs/flutter-apk destination-dir: app - # build-macos: - # name: Build-ios - # # https://github.com/actions/runner-images - # # https://xcodereleases.com/ - # runs-on: macos-15 - # steps: - # - name: Select Xcode version 16.3 - # run: sudo xcode-select -s /Applications/Xcode_16.3.app + build-macos: + name: Build-ios + # https://github.com/actions/runner-images + # https://xcodereleases.com/ + runs-on: macos-15 + steps: + - name: Select Xcode version 16.3 + run: sudo xcode-select -s /Applications/Xcode_16.3.app - # - name: Checkout code with submodules - # uses: actions/checkout@v4 - # with: - # submodules: recursive + - name: Checkout code with submodules + uses: actions/checkout@v4 + with: + submodules: recursive - # - name: Setup .env file - # run: | - # echo "${{ secrets.DEV_ENV_FILE_CONTENT }}" > .env - # shell: bash - - # - uses: sheenhx/action-flutter-build-ios@main - # with: - # # always use --export-options-plist=ios/GithubActionsExportOptions.plist - # build-cmd: flutter build ipa --build-number=$(( 15 + ${{ github.run_number }})) --export-options-plist=ios/GithubActionsExportOptions.plist - # certificate-base64: ${{ secrets.IOS_BUILD_CERTIFICATE_BASE64 }} - # certificate-password: ${{ secrets.IOS_BUILD_CERTIFICATE_PASSWORD }} - # provisioning-profile-base64: ${{ secrets.IOS_MOBILE_PROVISIONING_PROFILE_BASE64 }} - # keychain-password: ${{ secrets.IOS_GITHUB_KEYCHAIN_PASSWORD }} - - # - name: Archive IPA - # uses: actions/upload-artifact@v4 - # with: - # name: release-ipa - # # Try running the build locally with the build command to be sure of this path - # path: build/ios/ipa/*.ipa - - # build-macos-simulator: - # name: Build-ios-simulator - # # https://github.com/actions/runner-images - # # https://xcodereleases.com/ - # runs-on: macos-15 - - # steps: - # - name: Select Xcode version 16.3 - # run: sudo xcode-select -s /Applications/Xcode_16.3.app + - name: Setup .env file + run: | + echo "${{ secrets.DEV_ENV_FILE_CONTENT }}" > .env + shell: bash + + - uses: sheenhx/action-flutter-build-ios@main + with: + # always use --export-options-plist=ios/GithubActionsExportOptions.plist + build-cmd: flutter build ipa --build-number=$(( 15 + ${{ github.run_number }})) --export-options-plist=ios/GithubActionsExportOptions.plist + certificate-base64: ${{ secrets.IOS_BUILD_CERTIFICATE_BASE64 }} + certificate-password: ${{ secrets.IOS_BUILD_CERTIFICATE_PASSWORD }} + provisioning-profile-base64: ${{ secrets.IOS_MOBILE_PROVISIONING_PROFILE_BASE64 }} + keychain-password: ${{ secrets.IOS_GITHUB_KEYCHAIN_PASSWORD }} + + - name: Archive IPA + uses: actions/upload-artifact@v4 + with: + name: release-ipa + # Try running the build locally with the build command to be sure of this path + path: build/ios/ipa/*.ipa + + build-macos-simulator: + name: Build-ios-simulator + # https://github.com/actions/runner-images + # https://xcodereleases.com/ + runs-on: macos-15 + + steps: + - name: Select Xcode version 16.3 + run: sudo xcode-select -s /Applications/Xcode_16.3.app - # - name: Checkout code with submodules - # uses: actions/checkout@v4 - # with: - # submodules: recursive + - name: Checkout code with submodules + uses: actions/checkout@v4 + with: + submodules: recursive - # - name: Setup .env file - # run: | - # echo "${{ secrets.DEV_ENV_FILE_CONTENT }}" > .env - # shell: bash - - # - uses: sheenhx/action-flutter-build-ios@main - # with: - # # always use --export-options-plist=ios/GithubActionsExportOptions.plist - # build-cmd: flutter build ios --simulator --no-codesign --debug --dart-define=FLUTTER_BUILD_MODE=debug - # certificate-base64: ${{ secrets.IOS_BUILD_CERTIFICATE_BASE64 }} - # certificate-password: ${{ secrets.IOS_BUILD_CERTIFICATE_PASSWORD }} - # provisioning-profile-base64: ${{ secrets.IOS_MOBILE_PROVISIONING_PROFILE_BASE64 }} - # keychain-password: ${{ secrets.IOS_GITHUB_KEYCHAIN_PASSWORD }} - - # - name: Archive .app - # uses: actions/upload-artifact@v4 - # with: - # name: simulator-app - # # Try running the build locally with the build command to be sure of this path - # path: build/ios/iphonesimulator/*.app - - # upload-combined: - # permissions: write-all - # name: Combine and Upload Builds - # needs: [build-apk, build-macos] - # runs-on: ubuntu-latest - # steps: - # - name: Download Ubuntu artifact - # uses: actions/download-artifact@v4 - # with: - # name: release-apk - # path: combined-builds/android - - # - name: Download macOS artifact - # uses: actions/download-artifact@v4 - # with: - # name: release-ipa - # path: combined-builds/iOS - - # - name: Upload combined artifacts - # uses: actions/upload-artifact@v4 - # with: - # name: combined-builds - # path: combined-builds - - # - name: Generate - # id: generate - # uses: AcmeSoftwareLLC/app-build-number@v1 - # with: - # timezone: Asia/Kathmandu + - name: Setup .env file + run: | + echo "${{ secrets.DEV_ENV_FILE_CONTENT }}" > .env + shell: bash + + - uses: sheenhx/action-flutter-build-ios@main + with: + # always use --export-options-plist=ios/GithubActionsExportOptions.plist + build-cmd: flutter build ios --simulator --no-codesign --debug --dart-define=FLUTTER_BUILD_MODE=debug + certificate-base64: ${{ secrets.IOS_BUILD_CERTIFICATE_BASE64 }} + certificate-password: ${{ secrets.IOS_BUILD_CERTIFICATE_PASSWORD }} + provisioning-profile-base64: ${{ secrets.IOS_MOBILE_PROVISIONING_PROFILE_BASE64 }} + keychain-password: ${{ secrets.IOS_GITHUB_KEYCHAIN_PASSWORD }} + + - name: Archive .app + uses: actions/upload-artifact@v4 + with: + name: simulator-app + # Try running the build locally with the build command to be sure of this path + path: build/ios/iphonesimulator/*.app + + upload-combined: + permissions: write-all + name: Combine and Upload Builds + needs: [build-apk, build-macos] + runs-on: ubuntu-latest + steps: + - name: Download Ubuntu artifact + uses: actions/download-artifact@v4 + with: + name: release-apk + path: combined-builds/android + + - name: Download macOS artifact + uses: actions/download-artifact@v4 + with: + name: release-ipa + path: combined-builds/iOS + + - name: Upload combined artifacts + uses: actions/upload-artifact@v4 + with: + name: combined-builds + path: combined-builds + + - name: Generate + id: generate + uses: AcmeSoftwareLLC/app-build-number@v1 + with: + timezone: Asia/Kathmandu - # - name: Display the generated build number - # run: echo "Build Number > ${{ steps.generate.outputs.build-number }}" + - name: Display the generated build number + run: echo "Build Number > ${{ steps.generate.outputs.build-number }}" - # - uses: ncipollo/release-action@v1 - # with: - # artifacts: "combined-builds/android/*.apk,combined-builds/iOS/*.ipa" - # tag: ${{ steps.generate.outputs.build-number }} - # name: "Nightly-v${{ steps.generate.outputs.build-number }}-iOS/Android-Visit mxc1usd.com" - # generateReleaseNotes: true - # body: > - # imageimage + - uses: ncipollo/release-action@v1 + with: + artifacts: "combined-builds/android/*.apk,combined-builds/iOS/*.ipa" + tag: ${{ steps.generate.outputs.build-number }} + name: "Nightly-v${{ steps.generate.outputs.build-number }}-iOS/Android-Visit mxc1usd.com" + generateReleaseNotes: true + body: > + imageimage diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml index d77352f9..67e93d1f 100644 --- a/.github/workflows/submit.yml +++ b/.github/workflows/submit.yml @@ -24,7 +24,7 @@ jobs: echo "$(( ${{ secrets.PROD_ENV_FILE_CONTENT }} + 67 ))" > .env shell: bash - - uses: reasje/action-flutter-build-android@main + - uses: sheenhx/action-flutter-build-android@main with: keystore-base64: ${{ secrets.ANDROID_RELEASE_KEY }} keystore-password: "${{ secrets.ANDROID_RELEASE_KEY_PASSWORD }}" diff --git a/packages/shared b/packages/shared index 9eb02ca1..9fa28d60 160000 --- a/packages/shared +++ b/packages/shared @@ -1 +1 @@ -Subproject commit 9eb02ca1f17e9d744cd7a88ceb3c17537f677585 +Subproject commit 9fa28d60583960f27489c72557277af840602590 diff --git a/pubspec.yaml b/pubspec.yaml index b5f1508b..a885e3e2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,7 +18,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 2.0.13 +version: 2.0.15 environment: sdk: ">=2.19.0 <=3.6.1"