add gpg-sign parameter (#102)

* add gpg-sign parameter
flatpak · Apr 1, 2023 · 3c8cbdf · 3c8cbdf
1 parent 59b5d10
commit 3c8cbdf
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -53,6 +53,7 @@ jobs:
 | `cache-key` | Specifies the cache key. CPU arch is automatically added, so there is no need to add it to the cache key. | Optional | `flatpak-builder-${sha256(manifestPath)}` |
 | `arch` | Specifies the CPU architecture to build for | Optional | `x86_64` |
 | `mirror-screenshots-url` | Specifies the URL to mirror screenshots | Optional | - |
+| `gpg-sign` | The key to sign the package | Optional | - |
 
 #### Building for multiple CPU architectures
 

diff --git a/flatpak-builder/action.yml b/flatpak-builder/action.yml
@@ -69,6 +69,10 @@ inputs:
     description: >
       The URL to mirror screenshots.
     required: false
+  gpg-sign:
+    description: >
+      The key to sign the package.
+    required: false
 runs:
   using: "node16"
   main: "dist/index.js"
diff --git a/flatpak-builder/dist/index.js b/flatpak-builder/dist/index.js
@@ -172,8 +172,9 @@ const getModifiedManifestPath = manifestPath => {
  * @param {string} cacheHitKey The key used to restore the build directory
  * @param {string} arch The CPU architecture to build for
  * @param {string} mirrorScreenshotsUrl The URL to mirror screenshots
+ * @param {string} gpgSign The key to sign the package
  */
-const build = async (manifest, manifestPath, stopAtModule, bundle, buildBundle, repositoryUrl, repositoryName, buildDir, localRepoName, cacheBuildDir, cacheKey, cacheHitKey, arch, mirrorScreenshotsUrl) => {
+const build = async (manifest, manifestPath, stopAtModule, bundle, buildBundle, repositoryUrl, repositoryName, buildDir, localRepoName, cacheBuildDir, cacheKey, cacheHitKey, arch, mirrorScreenshotsUrl, gpgSign) => {
   const appId = manifest['app-id'] || manifest.id
   const branch = manifest.branch || core.getInput('branch') || 'master'
 
@@ -193,6 +194,9 @@ const build = async (manifest, manifestPath, stopAtModule, bundle, buildBundle,
   if (mirrorScreenshotsUrl) {
     args.push(`--mirror-screenshots-url=${mirrorScreenshotsUrl}`)
   }
+  if (gpgSign) {
+    args.push(`--gpg-sign=${gpgSign}`)
+  }
   if (stopAtModule) {
     args.push(`--stop-at=${stopAtModule}`)
   }
@@ -277,6 +281,7 @@ const prepareBuild = async (repositoryName, repositoryUrl, cacheBuildDir, restor
  * @param {string} cacheKey the default cache key if there are any
  * @param {string} arch The CPU architecture to build for
  * @param {string} mirrorScreenshotsUrl The URL to mirror screenshots
+ * @param {string} gpgSign The key to sign the package
  */
 const run = async (
   manifestPath,
@@ -292,7 +297,8 @@ const run = async (
   restoreCache,
   cacheKey,
   arch,
-  mirrorScreenshotsUrl
+  mirrorScreenshotsUrl,
+  gpgSign
 ) => {
   if (cacheBuildDir && !cacheKey) {
     try {
@@ -327,7 +333,7 @@ const run = async (
       return saveManifest(modifiedManifest, modifiedManifestPath)
     })
     .then((manifest) => {
-      return build(manifest, modifiedManifestPath, stopAtModule, bundle, buildBundle, repositoryUrl, repositoryName, buildDir, localRepoName, cacheBuildDir, cacheKey, cacheHitKey, arch, mirrorScreenshotsUrl)
+      return build(manifest, modifiedManifestPath, stopAtModule, bundle, buildBundle, repositoryUrl, repositoryName, buildDir, localRepoName, cacheBuildDir, cacheKey, cacheHitKey, arch, mirrorScreenshotsUrl, gpgSign)
     })
     .then(() => {
       if (dbusSession) {
@@ -382,7 +388,8 @@ if (require.main === require.cache[eval('__filename')]) {
     ['y', 'yes', 'true', 'enabled', true].includes(core.getInput('restore-cache')),
     core.getInput('cache-key'),
     core.getInput('arch'),
-    core.getInput('mirror-screenshots-url')
+    core.getInput('mirror-screenshots-url'),
+    core.getInput('gpg-sign')
   )
 }
 
@@ -67842,4 +67849,4 @@ module.exports = JSON.parse('[[[0,44],"disallowed_STD3_valid"],[[45,46],"valid"]
 /******/ 	module.exports = __webpack_exports__;
 /******/ 	
 /******/ })()
-;
+;
diff --git a/flatpak-builder/index.js b/flatpak-builder/index.js
@@ -166,8 +166,9 @@ const getModifiedManifestPath = manifestPath => {
  * @param {string} cacheHitKey The key used to restore the build directory
  * @param {string} arch The CPU architecture to build for
  * @param {string} mirrorScreenshotsUrl The URL to mirror screenshots
+ * @param {string} gpgSign The key to sign the package
  */
-const build = async (manifest, manifestPath, stopAtModule, bundle, buildBundle, repositoryUrl, repositoryName, buildDir, localRepoName, cacheBuildDir, cacheKey, cacheHitKey, arch, mirrorScreenshotsUrl) => {
+const build = async (manifest, manifestPath, stopAtModule, bundle, buildBundle, repositoryUrl, repositoryName, buildDir, localRepoName, cacheBuildDir, cacheKey, cacheHitKey, arch, mirrorScreenshotsUrl, gpgSign) => {
   const appId = manifest['app-id'] || manifest.id
   const branch = manifest.branch || core.getInput('branch') || 'master'
 
@@ -187,6 +188,9 @@ const build = async (manifest, manifestPath, stopAtModule, bundle, buildBundle,
   if (mirrorScreenshotsUrl) {
     args.push(`--mirror-screenshots-url=${mirrorScreenshotsUrl}`)
   }
+  if (gpgSign) {
+    args.push(`--gpg-sign=${gpgSign}`)
+  }
   if (stopAtModule) {
     args.push(`--stop-at=${stopAtModule}`)
   }
@@ -271,6 +275,7 @@ const prepareBuild = async (repositoryName, repositoryUrl, cacheBuildDir, restor
  * @param {string} cacheKey the default cache key if there are any
  * @param {string} arch The CPU architecture to build for
  * @param {string} mirrorScreenshotsUrl The URL to mirror screenshots
+ * @param {string} gpgSign The key to sign the package
  */
 const run = async (
   manifestPath,
@@ -286,7 +291,8 @@ const run = async (
   restoreCache,
   cacheKey,
   arch,
-  mirrorScreenshotsUrl
+  mirrorScreenshotsUrl,
+  gpgSign
 ) => {
   if (cacheBuildDir && !cacheKey) {
     try {
@@ -321,7 +327,7 @@ const run = async (
       return saveManifest(modifiedManifest, modifiedManifestPath)
     })
     .then((manifest) => {
-      return build(manifest, modifiedManifestPath, stopAtModule, bundle, buildBundle, repositoryUrl, repositoryName, buildDir, localRepoName, cacheBuildDir, cacheKey, cacheHitKey, arch, mirrorScreenshotsUrl)
+      return build(manifest, modifiedManifestPath, stopAtModule, bundle, buildBundle, repositoryUrl, repositoryName, buildDir, localRepoName, cacheBuildDir, cacheKey, cacheHitKey, arch, mirrorScreenshotsUrl, gpgSign)
     })
     .then(() => {
       if (dbusSession) {
@@ -376,6 +382,7 @@ if (require.main === module) {
     ['y', 'yes', 'true', 'enabled', true].includes(core.getInput('restore-cache')),
     core.getInput('cache-key'),
     core.getInput('arch'),
-    core.getInput('mirror-screenshots-url')
+    core.getInput('mirror-screenshots-url'),
+    core.getInput('gpg-sign')
   )
 }