Skip to content

Commit fd2433f

Browse files
committed
build: migrate dev to core24
1 parent c24a500 commit fd2433f

2 files changed

Lines changed: 48 additions & 19 deletions

File tree

.github/workflows/release-to-candidate.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ jobs:
5959
architectures: ${{ needs.get-architectures.outputs.architectures }}
6060
channel: dev/candidate
6161
github-token: ${{ secrets.GITHUB_TOKEN }}
62-
snapcraft-channel: 7.x/stable
6362
promotion-channel: dev/stable
6463

6564
screenshots:

snap/snapcraft.yaml

Lines changed: 48 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,44 +13,74 @@ description: |
1313
contact: https://github.com/snapcrafters/sublime-text/issues
1414
issues: https://github.com/snapcrafters/sublime-text/issues
1515
website: https://www.sublimetext.com/
16+
source-code: https://github.com/snapcrafters/sublime-text
1617
license: Proprietary
1718

18-
base: core22
19-
architectures:
20-
- arm64
21-
- amd64
19+
base: core24
20+
platforms:
21+
amd64:
22+
arm64:
2223

2324
grade: stable
2425
confinement: classic
2526
compression: lzo
2627

28+
# These libraries are discovered at runtime by libGL, GTK, or Sublime Text.
29+
lint:
30+
ignore:
31+
- library:
32+
- usr/lib/**/libGLX_mesa.so*
33+
- usr/lib/**/libXxf86vm.so*
34+
- usr/lib/**/libcurl.so*
35+
- usr/lib/**/libdconf.so*
36+
- usr/lib/**/liblber.so*
37+
- usr/lib/**/libldap.so*
38+
- usr/lib/**/libnghttp2.so*
39+
- usr/lib/**/libpsl.so*
40+
- usr/lib/**/librtmp.so*
41+
- usr/lib/**/libssh.so*
42+
- usr/lib/**/libsasl2.so*
43+
- usr/lib/**/libvulkan.so*
44+
- usr/lib/**/libxcb-glx.so*
45+
2746
apps:
2847
subl:
2948
command: opt/sublime_text/sublime_text
3049
desktop: usr/share/applications/sublime_text.desktop
31-
environment:
32-
LD_LIBRARY_PATH: $SNAP/usr/lib/x86_64-linux-gnu:$SNAP/usr/lib/aarch64-linux-gnu
3350

3451
parts:
3552
sublime-text:
36-
source: https://download.sublimetext.com/sublime-text_build-$SNAPCRAFT_PROJECT_VERSION_$SNAPCRAFT_TARGET_ARCH.deb
53+
source: https://download.sublimetext.com/sublime-text_build-${CRAFT_PROJECT_VERSION}_${CRAFT_ARCH_BUILD_FOR}.deb
3754
plugin: dump
3855
override-build: |
39-
snapcraftctl build
56+
craftctl default
4057
# Correct icon path
41-
sed -i 's|Icon=sublime-text|Icon=usr/share/icons/hicolor/256x256/apps/sublime-text.png|' $SNAPCRAFT_PART_INSTALL/usr/share/applications/sublime_text.desktop
58+
sed -i 's|Icon=sublime-text|Icon=usr/share/icons/hicolor/256x256/apps/sublime-text.png|' $CRAFT_PART_INSTALL/usr/share/applications/sublime_text.desktop
4259
4360
# Desktop Action are not Unity specific.
44-
sed -i 's|OnlyShowIn|#OnlyShowIn|g' $SNAPCRAFT_PART_INSTALL/usr/share/applications/sublime_text.desktop
61+
sed -i 's|OnlyShowIn|#OnlyShowIn|g' $CRAFT_PART_INSTALL/usr/share/applications/sublime_text.desktop
4562
stage-packages:
46-
- libbsd0
47-
- libffi7
63+
- libcurl4t64
4864
- libgl1
49-
- libgtk-3-0
50-
- libpcre3
65+
- libgtk-3-0t64
5166
- libx11-6
52-
- libxau6
53-
- libxcb1
54-
- libxdmcp6
67+
prime:
68+
- -usr/lib/*/libcolordprivate.so*
69+
- -usr/lib/*/libicui18n.so*
70+
- -usr/lib/*/libicuio.so*
71+
- -usr/lib/*/libicutest.so*
72+
- -usr/lib/*/libicutu.so*
5573
build-attributes:
56-
- no-patchelf
74+
- enable-patchelf
75+
76+
runtime-paths:
77+
after:
78+
- sublime-text
79+
plugin: nil
80+
build-packages:
81+
- patchelf
82+
override-prime: |
83+
craftctl default
84+
patchelf --force-rpath --set-rpath \
85+
"\$ORIGIN:\$ORIGIN/../../usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}:/snap/core24/current/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}:/snap/core24/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}" \
86+
"$CRAFT_PRIME/opt/sublime_text/sublime_text"

0 commit comments

Comments
 (0)