Skip to content

Fix: refresh snapd if already installed #51

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

Open
p-gentili wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: refresh snapd if already installed #51

Show file tree
Hide file tree
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
21 changes: 16 additions & 5 deletions __tests__/tools.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ test('ensureSnapd installs snapd if needed', async () => {
])
})

test('ensureSnapd is a no-op if snapd is installed', async () => {
expect.assertions(3)
test('ensureSnapd refreshes snapd if already installed', async () => {
expect.assertions(4)

const accessMock = jest
.spyOn(fs.promises, 'access')
Expand Down Expand Up @@ -87,11 +87,12 @@ test('ensureSnapd is a no-op if snapd is installed', async () => {

expect(accessMock).toHaveBeenCalled()
expect(statMock).toHaveBeenCalled()
expect(execMock).not.toHaveBeenCalled()
expect(execMock).toHaveBeenCalledTimes(1)
expect(execMock).toHaveBeenCalledWith('sudo', ['snap', 'refresh', 'snapd'])
})

test('ensureSnapd fixes permissions on the root directory', async () => {
expect.assertions(3)
expect.assertions(5)

const accessMock = jest
.spyOn(fs.promises, 'access')
Expand Down Expand Up @@ -121,7 +122,17 @@ test('ensureSnapd fixes permissions on the root directory', async () => {

expect(accessMock).toHaveBeenCalled()
expect(statMock).toHaveBeenCalled()
expect(execMock).toHaveBeenCalledWith('sudo', ['chown', 'root:root', '/'])
expect(execMock).toHaveBeenCalledTimes(2)
expect(execMock).toHaveBeenNthCalledWith(1, 'sudo', [
'snap',
'refresh',
'snapd'
])
expect(execMock).toHaveBeenNthCalledWith(2, 'sudo', [
'chown',
'root:root',
'/'
])
})

test('ensureSnapcraft installs Snapcraft if needed', async () => {
Expand Down
4 changes: 4 additions & 0 deletions src/tools.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ export async function ensureSnapd(): Promise<void> {
await exec.exec('sudo', ['apt-get', 'update', '-q'])
await exec.exec('sudo', ['apt-get', 'install', '-qy', 'snapd'])
}
else {
core.info('Refreshing snapd...')
await exec.exec('sudo', ['snap', 'refresh', 'snapd'])
}
// The Github worker environment has weird permissions on the root,
// which trip up snap-confine.
const root = await fs.promises.stat('/')
Expand Down