diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d991fd2..8ab308d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,6 +29,7 @@ jobs: - name: -- Step 4 -- Install node dependencies run: yarn install - name: -- Step 5 -- Install native dependencies + if: github.ref != 'refs/heads/main' run: npx pod-install - name: -- Step 6 -- Install ruby dependencies run: bundle install diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 0eacb643..55356923 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -57,7 +57,7 @@ private_lane :github_release do |options| description: "No changelog provided", commitish: git_branch, is_prerelease: options[:prerelease] - upload_assets: [lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH]] + upload_assets: ["#{File.expand_path('..', Dir.pwd)}/tooot-#{GITHUB_RELEASE}.apk"] ) end @@ -141,6 +141,7 @@ private_lane :build_android do "android.injected.signing.key.password" => ENV["ANDROID_KEYSTORE_KEY_PASSWORD"], } ) + sh "mv #{lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH]} #{File.expand_path('..', Dir.pwd)}/tooot-#{GITHUB_RELEASE}.apk" when "release" else if !is_ci