Skip to content

Commit

Permalink
Merge branch 'canonical:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
letFunny authored Jan 21, 2025
2 parents 1ade9cd + 717fecd commit 493d553
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
echo "ARCHIVE_FILE_SHA384=${ARCHIVE_FILE_SHA384}" >>$GITHUB_OUTPUT
- name: Upload archive as Actions artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ steps.archive.outputs.ARCHIVE_FILE }}
path: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/snap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: snapcore/action-build@v1

- name: Attach chisel snap to GH workflow execution
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ steps.build-chisel-snap.outputs.snap }}
path: ${{ steps.build-chisel-snap.outputs.snap }}
Expand All @@ -40,7 +40,7 @@ jobs:
chisel-version: ${{ steps.install-chisel-snap.outputs.version }}

steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: ${{ needs.build.outputs.chisel-snap }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
fi
- name: Upload HTML test coverage
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
continue-on-error: true
with:
Expand Down
7 changes: 6 additions & 1 deletion snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,15 @@ description: |
This snap can only install the slices in a location inside the
user $HOME directory i.e. the --root option in "cut" command
should have a location inside the user $HOME directory.
issues: https://github.com/canonical/chisel/issues
issues:
- https://github.com/canonical/chisel/issues
- https://github.com/Canonical/chisel/security/advisories
source-code: https://github.com/canonical/chisel
license: AGPL-3.0
adopt-info: chisel-release-data
contact:
- [email protected]
- [email protected]

base: core22
confinement: strict
Expand Down

0 comments on commit 493d553

Please sign in to comment.