Skip to content

Commit 15a083f

Browse files
authored
Merge pull request #8 from cyberplant/small-fix
Pequeñas correcciones
2 parents 8b7af38 + 7de00c8 commit 15a083f

File tree

2 files changed

+29
-30
lines changed

2 files changed

+29
-30
lines changed

.github/workflows/build-apk.yml renamed to .github/workflows/release-build-and-upload.yml

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build and Release APK
1+
name: En un release, compilar y subir el APK
22

33
on:
44
release:
@@ -14,16 +14,16 @@ jobs:
1414
runs-on: ubuntu-latest
1515
environment: Produccion
1616
steps:
17-
- name: Checkout code
17+
- name: Checkout del codigo
1818
uses: actions/checkout@v4
1919

20-
- name: Set up JDK 17
20+
- name: Setup de JDK 17
2121
uses: actions/setup-java@v4
2222
with:
2323
java-version: '17'
2424
distribution: 'temurin'
2525

26-
- name: Cache Gradle packages
26+
- name: Cache de packages de Gradle
2727
uses: actions/cache@v4
2828
with:
2929
path: |
@@ -33,48 +33,49 @@ jobs:
3333
restore-keys: |
3434
${{ runner.os }}-gradle-
3535
36-
- name: Grant execute permission for gradlew
36+
- name: Damos permisos al gradlew
3737
run: chmod +x gradlew
3838

39-
- name: Decode keystore
39+
- name: Decodificamos keystore
4040
run: |
4141
if [ ! -z "$KEYSTORE" ]; then
4242
echo "$KEYSTORE" | base64 --decode > keystore.jks
43-
echo "Keystore decoded successfully"
43+
echo "Keystore decodificada"
4444
else
45-
echo "Keystore or signing credentials not found, skipping keystore decode"
45+
echo "ERROR: No se encontro keystore en variable de entorno!"
46+
exit 1
4647
fi
4748
env:
4849
KEYSTORE: ${{ secrets.KEYSTORE }}
4950

50-
- name: Build debug APK
51+
- name: Compilamos debug APK
5152
run: ./gradlew assembleDebug
5253

53-
- name: Build release APK
54-
run: ./gradlew assembleRelease
55-
env:
56-
KEYSTORE: ${{ secrets.KEYSTORE }}
57-
SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
58-
# PKCS12 stores don't allow different passwords
59-
SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
60-
SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
61-
62-
- name: Upload debug APK to release
54+
- name: Subimos APK debug al Github release
6355
run: |
64-
cp ./app/build/outputs/apk/debug/app-debug.apk ./DonadorAutomatico-debug-v${{ github.event.release.tag_name }}.apk
56+
cp ./app/build/outputs/apk/debug/app-debug.apk ./DonadorAutomatico-debug-${{ github.event.release.tag_name }}.apk
6557
gh release upload ${{ github.event.release.tag_name }} \
66-
./DonadorAutomatico-debug-v${{ github.event.release.tag_name }}.apk \
58+
./DonadorAutomatico-debug-${{ github.event.release.tag_name }}.apk \
6759
--clobber \
6860
--repo ${{ github.repository }}
6961
env:
7062
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7163
if: github.event.release.tag_name != null
7264

73-
- name: Upload release APK to release
65+
- name: Compilamos release APK
66+
run: ./gradlew assembleRelease
67+
env:
68+
KEYSTORE: ${{ secrets.KEYSTORE }}
69+
SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
70+
# PKCS12 stores don't allow different passwords
71+
SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
72+
SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
73+
74+
- name: Subimos APK de release al Github release
7475
run: |
75-
cp ./app/build/outputs/apk/release/app-release.apk ./DonadorAutomatico-v${{ github.event.release.tag_name }}.apk
76+
cp ./app/build/outputs/apk/release/app-release.apk ./DonadorAutomatico-${{ github.event.release.tag_name }}.apk
7677
gh release upload ${{ github.event.release.tag_name }} \
77-
./DonadorAutomatico-v${{ github.event.release.tag_name }}.apk \
78+
./DonadorAutomatico-${{ github.event.release.tag_name }}.apk \
7879
--clobber \
7980
--repo ${{ github.repository }}
8081
env:

.github/workflows/build-test.yml renamed to .github/workflows/test-build-on-push.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Android CI
1+
name: Comprobar que funcione el build
22

33
on:
44
push:
@@ -13,14 +13,12 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v4
16-
- name: Set up JDK 17
16+
- name: Setup de JDK 17
1717
uses: actions/setup-java@v4
1818
with:
1919
java-version: '17'
2020
distribution: 'temurin'
2121
cache: gradle
2222

23-
- name: Grant execute permission for gradlew
24-
run: chmod +x gradlew
25-
- name: Run tests
26-
run: ./gradlew check
23+
- name: Corremos tests
24+
run: chmod +x gradlew && ./gradlew check

0 commit comments

Comments
 (0)