Skip to content

Don't modify original Flatpak manifest #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bilelmoussaoui merged 1 commit into from
Nov 23, 2021
Merged

Don't modify original Flatpak manifest #62

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions flatpak-builder/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,19 @@ const modifyManifest = (manifest, runTests = false) => {
return manifest
}

/**
* Gets the modified manifest as a YAML or JSON file
*
* @param {PathLike} manifestPath Where to save the flatpak manifest
* @returns {PathLike} the manifest
*/
const getModifiedManifestPath = manifestPath => {
return path.join(
path.dirname(manifestPath),
`flatpak-github-action-modified-${path.basename(manifestPath)}`
)
}

/**
* Build the flatpak & create a bundle from the build
*
Expand Down Expand Up @@ -244,13 +257,14 @@ const run = async (
core.setFailed(`Failed to prepare the build ${err}`)
}

const modifiedManifestPath = getModifiedManifestPath(manifestPath)
parseManifest(manifestPath)
.then((manifest) => {
const modifiedManifest = modifyManifest(manifest, runTests)
return saveManifest(modifiedManifest, manifestPath)
return saveManifest(modifiedManifest, modifiedManifestPath)
})
.then((manifest) => {
return build(manifest, manifestPath, bundle, repositoryUrl, repositoryName, buildDir, localRepoName, cacheBuildDir, cacheKey, arch)
return build(manifest, modifiedManifestPath, bundle, repositoryUrl, repositoryName, buildDir, localRepoName, cacheBuildDir, cacheKey, arch)
})
.then(() => {
core.info('Uploading artifact...')
Expand Down