-
Notifications
You must be signed in to change notification settings - Fork 17
patch: add bld support in snap builds #380
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.
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
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,7 +20,7 @@ on: | |
| snapcraft-snap-revisions: | ||
| description: | | ||
| JSON string with type dict[str, str] of architecture to snapcraft snap revision | ||
|
|
||
| Example: `{"amd64": "16585", "arm64": "16587"}` | ||
| required: false | ||
| type: string | ||
|
|
@@ -54,6 +54,17 @@ on: | |
| Timeout in minutes for the build job | ||
| default: 30 | ||
| type: number | ||
| sd-build: | ||
| description: | | ||
| Install the tools for SD build. | ||
| default: false | ||
| type: boolean | ||
| craft_sd_env: | ||
| description: | | ||
| the env to use to pull artifacts from | ||
| This is only used if `sd-build` is true. | ||
| default: production | ||
| type: string | ||
| outputs: | ||
| artifact-prefix: | ||
| description: Snap packages are uploaded to GitHub artifacts beginning with this prefix | ||
|
|
@@ -87,7 +98,7 @@ jobs: | |
| strategy: | ||
| matrix: | ||
| platform: ${{ fromJSON(needs.collect-platforms.outputs.platforms) }} | ||
| name: 'Build snap | ${{ matrix.platform.name }}' | ||
| name: "Build snap | ${{ matrix.platform.name }}" | ||
| needs: | ||
| - collect-platforms | ||
| runs-on: ${{ matrix.platform.runner }} | ||
|
|
@@ -140,6 +151,11 @@ jobs: | |
| env: | ||
| VAR_LXD_FLAG: ${{ steps.lxd-snap-version.outputs.install_flag }} | ||
| VAR_SNAPCRAFT_FLAG: ${{ steps.snapcraft-snap-version.outputs.install_flag }} | ||
| - name: Set up SD build environment | ||
| if: ${{ inputs.sd-build }} | ||
| run: | | ||
| sudo snap install craft-sd --channel=latest/beta | ||
| sudo snap install bld --edge | ||
| - run: snap list | ||
| - name: Pack snap | ||
| id: pack | ||
|
|
@@ -148,6 +164,8 @@ jobs: | |
| env: | ||
| SNAPCRAFT_BUILD_INFO: 1 | ||
| VAR_PLATFORM: ${{ matrix.platform.name }} | ||
| CI: ${{ inputs.sd-build && 1 || '' }} | ||
| CRAFT_SD_ENV: ${{ inputs.sd-build && inputs.craft_sd_env || '' }} | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit / Non blocking: Although this works, I think this is not easy to understand that it does. |
||
| - name: Snapcraft logs | ||
| if: ${{ success() || (failure() && steps.pack.outcome == 'failure') }} | ||
| run: cat ~/.local/state/snapcraft/log/* | ||
|
|
@@ -169,7 +187,7 @@ jobs: | |
| path: | | ||
| ${{ inputs.path-to-snap-project-directory }}/*.snap | ||
| .empty | ||
| include-hidden-files: true # For `.empty` | ||
| include-hidden-files: true # For `.empty` | ||
| if-no-files-found: error | ||
| permissions: | ||
| contents: read | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would use the type
choicehere to limit the available environments.There are only 3 possible values so let's enforce it.