From 2f51f79cea91063eb1538db6f36d886473ebf7a5 Mon Sep 17 00:00:00 2001 From: Adrian Castro <22133246+castdrian@users.noreply.github.com> Date: Fri, 22 Mar 2024 22:01:37 +0100 Subject: [PATCH] chore: improve build scripts --- .github/workflows/build-mobile-comment.yml | 13 +------------ .github/workflows/build-mobile.yml | 13 +------------ .github/workflows/release-mobile.yml | 13 +------------ apps/expo/package.json | 6 +++--- 4 files changed, 6 insertions(+), 39 deletions(-) diff --git a/.github/workflows/build-mobile-comment.yml b/.github/workflows/build-mobile-comment.yml index 1c650ed..146b695 100644 --- a/.github/workflows/build-mobile-comment.yml +++ b/.github/workflows/build-mobile-comment.yml @@ -47,14 +47,11 @@ jobs: - name: Build Android app run: cd apps/expo && pnpm apk - - name: Rename apk - run: cd apps/expo && mv android/app/build/outputs/apk/release/app-release.apk android/app/build/outputs/apk/release/movie-web.apk - - name: Upload movie-web.apk as artifact uses: actions/upload-artifact@v4 with: name: apk - path: ./apps/expo/android/app/build/outputs/apk/release/movie-web.apk + path: ./apps/expo/android/app/build/movie-web.apk build-ios: runs-on: macos-14 @@ -89,14 +86,6 @@ jobs: - name: Build iOS app run: cd apps/expo && pnpm ipa - - - name: Pack .ipa from .app - run: | - cd apps/expo - mkdir -p ios/build/Build/Products/Release-iphoneos/Payload - mv ios/build/Build/Products/Release-iphoneos/movieweb.app ios/build/Build/Products/Release-iphoneos/Payload/ - cd ios/build/Build/Products/Release-iphoneos - zip -r ../../../movie-web.ipa Payload - name: Upload movie-web.ipa as artifact uses: actions/upload-artifact@v4 diff --git a/.github/workflows/build-mobile.yml b/.github/workflows/build-mobile.yml index 042b2d2..998f91c 100644 --- a/.github/workflows/build-mobile.yml +++ b/.github/workflows/build-mobile.yml @@ -43,14 +43,11 @@ jobs: - name: Build Android app run: cd apps/expo && pnpm apk - - name: Rename apk - run: cd apps/expo && mv android/app/build/outputs/apk/release/app-release.apk android/app/build/outputs/apk/release/movie-web.apk - - name: Upload movie-web.apk as artifact uses: actions/upload-artifact@v4 with: name: apk - path: ./apps/expo/android/app/build/outputs/apk/release/movie-web.apk + path: ./apps/expo/android/app/build/movie-web.apk build-ios: runs-on: macos-14 @@ -80,14 +77,6 @@ jobs: - name: Build iOS app run: cd apps/expo && pnpm ipa - - - name: Pack .ipa from .app - run: | - cd apps/expo - mkdir -p ios/build/Build/Products/Release-iphoneos/Payload - mv ios/build/Build/Products/Release-iphoneos/movieweb.app ios/build/Build/Products/Release-iphoneos/Payload/ - cd ios/build/Build/Products/Release-iphoneos - zip -r ../../../movie-web.ipa Payload - name: Upload movie-web.ipa as artifact uses: actions/upload-artifact@v4 diff --git a/.github/workflows/release-mobile.yml b/.github/workflows/release-mobile.yml index 6c995ce..14277dd 100644 --- a/.github/workflows/release-mobile.yml +++ b/.github/workflows/release-mobile.yml @@ -67,14 +67,11 @@ jobs: - name: Build Android app run: cd apps/expo && pnpm apk - - name: Rename apk - run: cd apps/expo && mv android/app/build/outputs/apk/release/app-release.apk android/app/build/outputs/apk/release/movie-web.apk - - name: Upload movie-web.apk as artifact uses: actions/upload-artifact@v4 with: name: apk - path: ./apps/expo/android/app/build/outputs/apk/release/movie-web.apk + path: ./apps/expo/android/app/build/movie-web.apk build-ios: runs-on: macos-14 @@ -108,14 +105,6 @@ jobs: - name: Build iOS app run: cd apps/expo && pnpm ipa - - - name: Pack .ipa from .app - run: | - cd apps/expo - mkdir -p ios/build/Build/Products/Release-iphoneos/Payload - mv ios/build/Build/Products/Release-iphoneos/movieweb.app ios/build/Build/Products/Release-iphoneos/Payload/ - cd ios/build/Build/Products/Release-iphoneos - zip -r ../../../movie-web.ipa Payload - name: Upload movie-web.ipa as artifact uses: actions/upload-artifact@v4 diff --git a/apps/expo/package.json b/apps/expo/package.json index cf45230..e9878b9 100644 --- a/apps/expo/package.json +++ b/apps/expo/package.json @@ -10,9 +10,9 @@ "dev:ios": "expo start -c --ios", "android": "expo run:android", "ios": "expo run:ios", - "apk": "expo prebuild --platform=android && cd android && ./gradlew assembleRelease", - "ipa": "expo prebuild --platform=ios && cd ios && xcodebuild -workspace movieweb.xcworkspace -scheme movieweb -configuration Release -derivedDataPath build -destination generic/platform=iOS CODE_SIGN_IDENTITY=\"\"", - "ipa:sim": "expo prebuild --platform=ios && cd ios && xcodebuild -workspace movieweb.xcworkspace -scheme movieweb -configuration Release -derivedDataPath build -destination \"generic/platform=iOS Simulator\" CODE_SIGN_IDENTITY=\"\"", + "apk": "expo prebuild --platform=android && cd android && ./gradlew assembleRelease && mv app/build/outputs/apk/release/app-release.apk app/build/movie-web.apk", + "ipa": "expo prebuild --platform=ios && cd ios && xcodebuild clean archive -workspace movieweb.xcworkspace -scheme movieweb -configuration Release -destination generic/platform=iOS -archivePath build/movieweb.xcarchive CODE_SIGN_IDENTITY=\"\" CODE_SIGNING_ALLOWED=NO | xcpretty && cd build/movieweb.xcarchive/Products && mv Applications Payload && zip -r movie-web.ipa Payload && mv movie-web.ipa ../..", + "ipa:sim": "expo prebuild --platform=ios && cd ios && xcodebuild clean archive -workspace movieweb.xcworkspace -scheme movieweb -configuration Release -destination \"generic/platform=iOS Simulator\" -archivePath build/movieweb.xcarchive CODE_SIGN_IDENTITY=\"\" CODE_SIGNING_ALLOWED=NO | xcpretty && cd build/movieweb.xcarchive/Products && mv Applications Payload && zip -r movie-web.ipa Payload && mv movie-web.ipa ../..", "format": "prettier --check . --ignore-path ../../.gitignore", "lint": "eslint .", "typecheck": "tsc --noEmit"