diff --git a/.github/workflows/android_ci_cd.yml b/.github/workflows/android_ci_cd.yml index 60190731..d30f2871 100644 --- a/.github/workflows/android_ci_cd.yml +++ b/.github/workflows/android_ci_cd.yml @@ -35,43 +35,42 @@ jobs: # BASE_URL -> local.properties 생성 - name: Create local.properties - run: | - echo "api.baseurl=$BASE_URL" > $GITHUB_WORKSPACE/local.properties + run: echo "api.baseurl=$BASE_URL" > $GITHUB_WORKSPACE/local.properties # 캐시 정리 - - name: Clean Gradle cache - run: ./gradlew clean +# - name: Clean Gradle cache +# run: ./gradlew clean # Generate Keystore File - - name: Generate Keystore File - env: - KEY_STORE: ${{ secrets.APP_KEYSTORE_BASE64 }} - run: | - echo $KEY_STORE > ./keystore.b64 - base64 -d -i ./keystore.b64 > ./release.keystore +# - name: Generate Keystore File +# env: +# KEY_STORE: ${{ secrets.APP_KEYSTORE_BASE64 }} +# run: | +# echo $KEY_STORE > ./keystore.b64 +# base64 -d -i ./keystore.b64 > ./release.keystore # Generate keystore.properties - - name: Generate keystore.properties - env: - STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} - KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - KEY_ALIAS: ${{ secrets.KEY_ALIAS }} - STORE_FILE: ${{ secrets.STORE_FILE }} - run: | - echo storePassword=$STORE_PASSWORD > ./keystore.properties - echo keyPassword=$KEY_PASSWORD > ./keystore.properties - echo keyAlias=$KEY_ALIAS > ./keystore.properties - echo storeFile=$STORE_FILE > ./keystore.properties +# - name: Generate keystore.properties +# env: +# STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} +# KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} +# KEY_ALIAS: ${{ secrets.KEY_ALIAS }} +# STORE_FILE: ${{ secrets.STORE_FILE }} +# run: | +# echo storePassword=$STORE_PASSWORD > ./keystore.properties +# echo keyPassword=$KEY_PASSWORD > ./keystore.properties +# echo keyAlias=$KEY_ALIAS > ./keystore.properties +# echo storeFile=$STORE_FILE > ./keystore.properties # Build APK Release - - name: Build Release Apk - run: ./gradlew assembleRelease --stacktrace --warning-mode=all +# - name: Build Release Apk +# run: ./gradlew assembleRelease --stacktrace --warning-mode=all +# +# - name: APK 디렉토리 확인 (디버깅용) / Release +# run: ls -alh app/build/outputs/apk/release/ - - name: APK 디렉토리 확인 (디버깅용) / Release - run: ls -alh app/build/outputs/apk/release/ - -# - name: Build Debug Apk -# run: ./gradlew assembleDebug + - name: Build Debug Apk + run: ./gradlew assembleDebug # - name: APK 디렉토리 확인 (디버깅용) / Debug # run: ls -alh app/build/outputs/apk/debug/ @@ -81,18 +80,18 @@ jobs: # run: ./gradlew bundleRelease # Firebase에 배포 - - name: Upload Firebase App Distribution / Release - uses: wzieba/Firebase-Distribution-Github-Action@v1 - with: - appId: ${{secrets.FIREBASE_APP_ID}} - serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }} - groups: swmarastro - file: app/build/outputs/apk/release/app-release-unsigned.apk - -# - name: Upload Firebase App Distribution / Debug +# - name: Upload Firebase App Distribution / Release # uses: wzieba/Firebase-Distribution-Github-Action@v1 # with: # appId: ${{secrets.FIREBASE_APP_ID}} # serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }} # groups: swmarastro -# file: app/build/outputs/apk/debug/app-debug.apk \ No newline at end of file +# file: app/build/outputs/apk/release/app-release-unsigned.apk + + - name: Upload Firebase App Distribution / Debug + uses: wzieba/Firebase-Distribution-Github-Action@v1 + with: + appId: ${{secrets.FIREBASE_APP_ID}} + serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }} + groups: swmarastro + file: app/build/outputs/apk/debug/app-debug.apk \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 16ce7d48..4cad5929 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,9 +5,9 @@ plugins { id 'dagger.hilt.android.plugin' } -def keystorePropertiesFile = project.rootProject.file("keystore.properties") -def keystoreProperties = new Properties() -keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) +//def keystorePropertiesFile = project.rootProject.file("keystore.properties") +//def keystoreProperties = new Properties() +//keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) android { namespace 'com.swmarastro.mykkumi.android' @@ -24,14 +24,14 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - signingConfigs { - config { - keyAlias keystoreProperties['keyAlias'] - keyPassword keystoreProperties['keyPassword'] - storeFile file(keystoreProperties['storeFile']) - storePassword keystoreProperties['storePassword'] - } - } +// signingConfigs { +// config { +// keyAlias keystoreProperties['keyAlias'] +// keyPassword keystoreProperties['keyPassword'] +// storeFile file(keystoreProperties['storeFile']) +// storePassword keystoreProperties['storePassword'] +// } +// } buildTypes { release { @@ -40,7 +40,7 @@ android { manifestPlaceholders = [ appName : "@string/app_name" ] - signingConfig signingConfigs.config +// signingConfig signingConfigs.config } debug { applicationIdSuffix '.dev'