Skip to content

Commit 03401f9

Browse files
committed
Remove GPG and Checksum from Gradle steps, into github actions
1 parent 3019a7c commit 03401f9

File tree

2 files changed

+37
-26
lines changed

2 files changed

+37
-26
lines changed

.github/workflows/generate-release-apk.yml

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,34 @@ jobs:
4242
SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
4343
SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
4444
SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
45-
- name: Sign and Checksum APK
46-
run: ./gradlew copyFinalAPK -Psigning.gnupg.passphrase=${{ secrets.GPG_SIGNING_PASSWORD }} -Psigning.gnupg.executable=gpg
47-
- name: List the files
48-
run: |
49-
tree gpslogger/build/outputs/
50-
ls -lah gpslogger/
51-
- uses: actions/attest-build-provenance@v1
52-
id: attest
53-
with:
54-
subject-path: gpslogger/gpslogger-*.apk
45+
- name: Copy and rename the APK
46+
run: ./gradlew copyFinalAPK -Psigning.gnupg.passphrase=${{ secrets.GPG_SIGNING_PASSWORD }} -Psigning.gnupg.executable=gpg
5547
- name: Get APK and WORKFLOW REF
5648
id: references
5749
run: |
5850
APK_FILE_NAME=$(find gpslogger/ -maxdepth 1 -name "gpslogger-*.apk" -print -quit | xargs basename)
59-
logIndex=$(jq -r '.verificationMaterial.tlogEntries[0].logIndex' < ${{ steps.attest.outputs.bundle-path }})
6051
echo "APK_FILE_NAME=$APK_FILE_NAME" >> "$GITHUB_OUTPUT"
6152
echo "GITHUB_WORKFLOW_REF=$GITHUB_WORKFLOW_REF" >> "$GITHUB_OUTPUT"
53+
- name: GPG Sign the APK
54+
run: |
55+
gpg --pinentry-mode loopback --passphrase ${{ secrets.GPG_SIGNING_PASSWORD }} --yes -ab --output gpslogger/${{ steps.references.outputs.APK_FILE_NAME }}.asc gpslogger/${{ steps.references.outputs.APK_FILE_NAME }}
56+
- name: Checksum the APK
57+
run: |
58+
cd gpslogger
59+
sha256sum gpslogger-132-rc2.apk > gpslogger-132-rc2.apk.SHA256
60+
- name: Cosign Attestation of the APK
61+
uses: actions/attest-build-provenance@v1
62+
id: attest
63+
with:
64+
subject-path: gpslogger/gpslogger-*.apk
65+
- name: List the files
66+
run: |
67+
tree gpslogger/build/outputs/
68+
ls -lah gpslogger/
69+
- name: Get LOGINDEX
70+
id: logindex
71+
run: |
72+
logIndex=$(jq -r '.verificationMaterial.tlogEntries[0].logIndex' < ${{ steps.attest.outputs.bundle-path }})
6273
echo "REKOR_LOGINDEX=$logIndex" >> "$GITHUB_OUTPUT"
6374
- name: Copy cosign bundle
6475
run: cp ${{ steps.attest.outputs.bundle-path }} gpslogger/${{ steps.references.outputs.APK_FILE_NAME }}.cosign.bundle
@@ -84,7 +95,7 @@ jobs:
8495
cosign verify-blob ${{ steps.references.outputs.APK_FILE_NAME }} --bundle ${{ steps.references.outputs.APK_FILE_NAME }}.cosign.bundle --new-bundle-format --cert-oidc-issuer https://token.actions.githubusercontent.com --cert-identity https://github.com/${{ steps.references.outputs.GITHUB_WORKFLOW_REF }}
8596
```
8697
87-
[Rekor transparency log](https://search.sigstore.dev?logIndex=${{ steps.references.outputs.REKOR_LOGINDEX }})
98+
[Rekor transparency log](https://search.sigstore.dev?logIndex=${{ steps.logindex.outputs.REKOR_LOGINDEX }})
8899
files: |
89100
gpslogger/gpslogger-*.apk
90101
gpslogger/gpslogger-*.apk.asc

gpslogger/build.gradle

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ buildscript {
1717
//Android
1818
apply plugin: 'com.android.application'
1919

20-
//Generating PGP
21-
apply plugin: 'signing'
20+
////Generating PGP
21+
//apply plugin: 'signing'
2222
//Generating colorful output
2323
apply from: 'buildtools/ColoredOutput.gradle'
2424
project.ext.set("GHACTIONS_FOLDING", true)
@@ -307,18 +307,18 @@ task copyFinalAPK(group:'build') {
307307
fileName.replace("gpslogger-release.apk", finalApkName)
308308
}
309309
}
310-
//PGP Sign
311-
//Verify with gpg --verify ~/Downloads/gpslogger-71.apk.asc
312-
if(file(finalApkName).isFile()){
313-
signing {
314-
useGpgCmd()
315-
sign file(finalApkName)
316-
}
317-
318-
//SHA256 Checksum
319-
//Verify with sha256sum -c ~/Downloads/gpslogger-71.apk.SHA256
320-
ant.checksum(file: finalApkName, fileext: '.SHA256', algorithm: "SHA-256", pattern: "{0} {1}")
321-
}
310+
// //PGP Sign
311+
// //Verify with gpg --verify ~/Downloads/gpslogger-71.apk.asc
312+
// if(file(finalApkName).isFile()){
313+
// signing {
314+
// useGpgCmd()
315+
// sign file(finalApkName)
316+
// }
317+
//
318+
// //SHA256 Checksum
319+
// //Verify with sha256sum -c ~/Downloads/gpslogger-71.apk.SHA256
320+
// ant.checksum(file: finalApkName, fileext: '.SHA256', algorithm: "SHA-256", pattern: "{0} {1}")
321+
// }
322322

323323
}
324324

0 commit comments

Comments
 (0)