diff --git a/.github/workflows/release_internal.yml b/.github/workflows/release_internal.yml index 0df03d18..fe0b58c6 100644 --- a/.github/workflows/release_internal.yml +++ b/.github/workflows/release_internal.yml @@ -2,11 +2,13 @@ name: Deploy for internal testing on: push: - branches: internal + branches: + - '**' + tags-ignore: + - '**' workflow_dispatch: jobs: - build: name: Build for ${{ matrix.targetPlatform }} runs-on: ubuntu-latest @@ -17,7 +19,6 @@ jobs: - StandaloneLinux64 - StandaloneWindows64 - StandaloneOSX - - Android steps: - uses: actions/checkout@v2 with: @@ -46,11 +47,6 @@ jobs: with: targetPlatform: ${{ matrix.targetPlatform }} buildName: ArcCreate - androidKeystoreName: arccreate - androidKeystoreBase64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }} - androidKeystorePass: ${{ secrets.ANDROID_KEYSTORE_PASS }} - androidKeyaliasName: ${{ secrets.ANDROID_KEYALIAS_NAME }} - androidKeyaliasPass: ${{ secrets.ANDROID_KEYALIAS_PASS }} - uses: actions/upload-artifact@v2 with: @@ -94,8 +90,8 @@ jobs: - uses: actions/upload-artifact@v3 with: - name: build-AndroidBundle - path: build/AndroidBundle + name: build-Android + path: build/Android releaseToGooglePlay: name: Release to the Google Play Store @@ -105,7 +101,7 @@ jobs: GOOGLE_PLAY_KEY_FILE: ${{ secrets.GOOGLE_PLAY_KEY_FILE }} GOOGLE_PLAY_KEY_FILE_PATH: ${{ format('{0}/fastlane/google-fastlane.json', github.workspace) }} - ANDROID_BUILD_FILE_PATH: ${{ format('{0}/build/AndroidBundle/Android.aab', github.workspace) }} + ANDROID_BUILD_FILE_PATH: ${{ format('{0}/build/Android/Android.aab', github.workspace) }} ANDROID_PACKAGE_NAME: ${{ secrets.ANDROID_PACKAGE_NAME }} steps: - name: Checkout Repository @@ -114,8 +110,8 @@ jobs: - name: Download Android Artifact uses: actions/download-artifact@v2 with: - name: build-AndroidBundle - path: build/AndroidBundle + name: build-Android + path: build/Android - name: Add Authentication run: echo "$GOOGLE_PLAY_KEY_FILE" > $GOOGLE_PLAY_KEY_FILE_PATH @@ -135,4 +131,88 @@ jobs: if: always() uses: geekyeggo/delete-artifact@v1 with: - name: build-Android \ No newline at end of file + name: build-Android + + buildForiOSPlatform: + name: Build for iOS + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Decrypt & extract secrets + run: ./decrypt_secret.sh + env: + SECRET_PASSPHRASE: ${{ secrets.ENCRYPTED_FILE_SECRET_PASSPHRASE }} + + - uses: actions/cache@v2 + with: + path: Library + key: Library-iOS + + - uses: actions/cache@v2 + with: + path: Library + key: + Library-iOS-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }} + restore-keys: | + Library-iOS- + Library- + + - uses: game-ci/unity-builder@v2 + env: + UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} + UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} + UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} + with: + targetPlatform: iOS + buildName: ArcCreate + + - uses: actions/upload-artifact@v2 + with: + name: build-iOS + path: build/iOS + + releaseToAppStore: + name: Release to the App Store + runs-on: macos-latest + needs: buildForiOSPlatform + steps: + - name: Checkout Repository + uses: actions/checkout@v2 + + - name: Download iOS Artifact + uses: actions/download-artifact@v2 + with: + name: build-iOS + path: build/iOS + + - name: Fix File Permissions and Run fastlane + env: + APPLE_CONNECT_EMAIL: ${{ secrets.APPLE_CONNECT_EMAIL }} + APPLE_DEVELOPER_EMAIL: ${{ secrets.APPLE_DEVELOPER_EMAIL }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + + MATCH_REPOSITORY: ${{ secrets.MATCH_REPOSITORY }} + MATCH_DEPLOY_KEY: ${{ secrets.MATCH_DEPLOY_KEY }} + MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} + + APPSTORE_ISSUER_ID: ${{ secrets.APPSTORE_ISSUER_ID }} + APPSTORE_KEY_ID: ${{ secrets.APPSTORE_KEY_ID }} + APPSTORE_P8: ${{ secrets.APPSTORE_P8 }} + + IOS_BUILD_PATH: ${{ format('{0}/build/iOS/ArcCreate', github.workspace) }} + IOS_BUNDLE_ID: com.Arcthesia.ArcCreate + PROJECT_NAME: ArcCreate + run: | + ls $IOS_BUILD_PATH + eval "$(ssh-agent -s)" + ssh-add - <<< "${MATCH_DEPLOY_KEY}" + find $IOS_BUILD_PATH -type f -name "**.sh" -exec chmod +x {} \; + bundle install + bundle exec fastlane ios beta + + - name: Cleanup to avoid storage limit + if: always() + uses: geekyeggo/delete-artifact@v1 + with: + name: build-iOS \ No newline at end of file diff --git a/.github/workflows/release_public.yml b/.github/workflows/release_public.yml index 6bc57b1f..66dda612 100644 --- a/.github/workflows/release_public.yml +++ b/.github/workflows/release_public.yml @@ -2,11 +2,14 @@ name: Deploy for public release on: push: - branches: master + tags: + - '*' workflow_dispatch: jobs: build: + permissions: + contents: write name: Build for ${{ matrix.targetPlatform }} runs-on: ubuntu-latest strategy: @@ -46,7 +49,6 @@ jobs: with: targetPlatform: ${{ matrix.targetPlatform }} buildName: ArcCreate - androidAppBundle: true androidKeystoreName: arccreate androidKeystoreBase64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }} androidKeystorePass: ${{ secrets.ANDROID_KEYSTORE_PASS }} @@ -59,6 +61,20 @@ jobs: name: build-${{ matrix.targetPlatform }} path: build/${{ matrix.targetPlatform }} + - name: Zip Build + uses: montudor/action-zip@v1 + with: + args: zip -qq -r build/${{ matrix.targetPlatform }}.zip build/${{ matrix.targetPlatform }} + + - name: Upload Zip to GitHub Release + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: build/${{ matrix.targetPlatform }}.zip + asset_name: ${{ matrix.targetPlatform }}.zip + tag: ${{ github.ref }} + overwrite: true + releaseToGooglePlay: name: Release to the Google Play Store runs-on: ubuntu-latest @@ -72,27 +88,26 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v3 + - name: Download Android Artifact uses: actions/download-artifact@v2 with: name: build-Android path: build/Android + - name: Add Authentication run: echo "$GOOGLE_PLAY_KEY_FILE" > $GOOGLE_PLAY_KEY_FILE_PATH + - name: Set up Fastlane uses: ruby/setup-ruby@v1 with: ruby-version: 2.7.2 bundler-cache: true + - name: Upload to Google Play Internal uses: maierj/fastlane-action@v2.0.1 with: lane: 'android production' - - name: Cleanup to avoid storage limit - if: always() - uses: geekyeggo/delete-artifact@v1 - with: - name: build-Android releaseToAppStore: name: Release to the App Store @@ -131,4 +146,4 @@ jobs: ssh-add - <<< "${MATCH_DEPLOY_KEY}" find $IOS_BUILD_PATH -type f -name "**.sh" -exec chmod +x {} \; bundle install - bundle exec fastlane ios beta \ No newline at end of file + bundle exec fastlane ios release \ No newline at end of file diff --git a/.github/workflows/testflight.yml b/.github/workflows/testflight.yml deleted file mode 100644 index a5f6d459..00000000 --- a/.github/workflows/testflight.yml +++ /dev/null @@ -1,84 +0,0 @@ -name: Deploy to TestFlight - -on: workflow_dispatch - -jobs: - buildForiOSPlatform: - name: Build for iOS - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - name: Decrypt & extract secrets - run: ./decrypt_secret.sh - env: - SECRET_PASSPHRASE: ${{ secrets.ENCRYPTED_FILE_SECRET_PASSPHRASE }} - - - uses: actions/cache@v2 - with: - path: Library - key: Library-iOS - - - uses: actions/cache@v2 - with: - path: Library - key: - Library-iOS-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }} - restore-keys: | - Library-iOS- - Library- - - - uses: game-ci/unity-builder@v2 - env: - UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} - UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} - UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} - with: - targetPlatform: iOS - buildName: ArcCreate - versioning: Custom - version: "0.2" - - - uses: actions/upload-artifact@v2 - with: - name: build-iOS - path: build/iOS - - releaseToAppStore: - name: Release to the App Store - runs-on: macos-latest - needs: buildForiOSPlatform - steps: - - name: Checkout Repository - uses: actions/checkout@v2 - - - name: Download iOS Artifact - uses: actions/download-artifact@v2 - with: - name: build-iOS - path: build/iOS - - - name: Fix File Permissions and Run fastlane - env: - APPLE_CONNECT_EMAIL: ${{ secrets.APPLE_CONNECT_EMAIL }} - APPLE_DEVELOPER_EMAIL: ${{ secrets.APPLE_DEVELOPER_EMAIL }} - APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} - - MATCH_REPOSITORY: ${{ secrets.MATCH_REPOSITORY }} - MATCH_DEPLOY_KEY: ${{ secrets.MATCH_DEPLOY_KEY }} - MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} - - APPSTORE_ISSUER_ID: ${{ secrets.APPSTORE_ISSUER_ID }} - APPSTORE_KEY_ID: ${{ secrets.APPSTORE_KEY_ID }} - APPSTORE_P8: ${{ secrets.APPSTORE_P8 }} - - IOS_BUILD_PATH: ${{ format('{0}/build/iOS/ArcCreate', github.workspace) }} - IOS_BUNDLE_ID: com.Arcthesia.ArcCreate - PROJECT_NAME: ArcCreate - run: | - ls $IOS_BUILD_PATH - eval "$(ssh-agent -s)" - ssh-add - <<< "${MATCH_DEPLOY_KEY}" - find $IOS_BUILD_PATH -type f -name "**.sh" -exec chmod +x {} \; - bundle install - bundle exec fastlane ios beta \ No newline at end of file diff --git a/Assets/Materials/Compose/Waveform.mat b/Assets/Materials/Compose/Waveform.mat index 68e4fcb1..297eb470 100644 --- a/Assets/Materials/Compose/Waveform.mat +++ b/Assets/Materials/Compose/Waveform.mat @@ -72,7 +72,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - - _ToSample: 13918327 + - _ToSample: 10478160 - _UVSec: 0 - _ZWrite: 1 m_Colors: diff --git a/Assets/Materials/Gameplay/PracticeeWaveform.mat b/Assets/Materials/Gameplay/PracticeeWaveform.mat index 55625e98..cb791bce 100644 --- a/Assets/Materials/Gameplay/PracticeeWaveform.mat +++ b/Assets/Materials/Gameplay/PracticeeWaveform.mat @@ -56,7 +56,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _AudioLength: 11645382 + - _AudioLength: 29642254 - _BumpScale: 1 - _CurrentTimingSample: 0 - _Cutoff: 0.5 diff --git a/Assets/Scripts/Storage/FileStorage.cs b/Assets/Scripts/Storage/FileStorage.cs index c4fce1b5..b78f08db 100755 --- a/Assets/Scripts/Storage/FileStorage.cs +++ b/Assets/Scripts/Storage/FileStorage.cs @@ -41,7 +41,6 @@ public static void MigrateToNewStorage() } File.Copy(realLegacyPath, targetPath); - File.Delete(realLegacyPath); } Collection.Delete(Query.All()); diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e35ee63a..4ddc2719 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -175,7 +175,7 @@ PlayerSettings: androidMaxAspectRatio: 2.1 applicationIdentifier: {} buildNumber: - iPhone: 38 + iPhone: 39 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 19 AndroidTargetSdkVersion: 0 diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 94740471..504a9ac6 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -84,11 +84,11 @@ end platform :android do desc "Upload a new Android version to the production Google Play Store" lane :production do - upload_to_play_store(track: 'production', release_status: 'draft', aab: "#{ENV['ANDROID_BUILD_FILE_PATH']}") + upload_to_play_store(track: 'production', release_status: 'completed', aab: "#{ENV['ANDROID_BUILD_FILE_PATH']}") end desc "Upload a new Android internal version to Google Play" lane :internal do - upload_to_play_store(track: 'internal', release_status: 'draft', aab: "#{ENV['ANDROID_BUILD_FILE_PATH']}") + upload_to_play_store(track: 'internal', release_status: 'completed', aab: "#{ENV['ANDROID_BUILD_FILE_PATH']}") end end \ No newline at end of file