Skip to content

Commit

Permalink
Merge pull request juju#17614 from wallyworld/fix-snap-build
Browse files Browse the repository at this point in the history
juju#17614

A small snapcraft yaml fix to repair the building of the juju snap.

```
+ mv /build/snapcraft-juju-c8e48f6ce8fae175befe84541b6a64e1/parts/jujud/install/bin/jujud /build/snapcraft-juju-c8e48f6ce8fae175befe84541b6a64e1/parts/jujud/install/bin/jujud
mv: '/build/snapcraft-juju-c8e48f6ce8fae175befe84541b6a64e1/parts/jujud/install/bin/jujud' and '/build/snapcraft-juju-c8e48f6ce8fae175befe84541b6a64e1/parts/jujud/install/bin/jujud' are the same file
Failed to run 'override-build': Exit code was 1.
Build failed
```

There was leftover code from when the juju-controller stuff was backed out.
  • Loading branch information
jujubot authored Jul 1, 2024
2 parents d2d3eac + e3cdde6 commit a76fa54
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -409,9 +409,6 @@ parts:
go-cgo-cflags: "-I/usr/local/musl/include"
go-cgo-ldflags: "-luv -lraft -ldqlite -llz4 -lsqlite3"
go-cgo-ldflags-allow: "(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"
override-build: |
snapcraftctl build
mv ${SNAPCRAFT_PART_INSTALL}/bin/jujud ${SNAPCRAFT_PART_INSTALL}/bin/jujud

juju:
after:
Expand Down

0 comments on commit a76fa54

Please sign in to comment.