Skip to content

Commit db01fa1

Browse files
committed
fix(ci): fix the update logic for content snap
rename the workflow to update-snap as it updates both the sdk and the content snap. fix the readme for the same. update the content snap to the same version as the sdk snap. Signed-off-by: Soumyadeep Ghosh <[email protected]>
1 parent 76bc2fe commit db01fa1

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Update SDK Snap
1+
name: Update Snap
22

33
on:
44
# Runs at 10:00 UTC every day
@@ -41,6 +41,5 @@ jobs:
4141
branch: "2404"
4242
snapcraft-project-root: "webkitgtk-6-gnome-2404"
4343
update-script: |
44-
latest_tag=$(git ls-remote --refs --sort='v:refname' --tags https://gitlab.gnome.org/GNOME/gnome-build-meta.git | awk -F'/' '{print $NF}' | grep -E '^[0-9]+(\.[0-9]+)*$' | sort -V | tail -n 1)
45-
webkitgtk_version=$(curl -s "https://gitlab.gnome.org/GNOME/gnome-build-meta/-/raw/${latest_tag}/elements/sdk/webkitgtk.inc?ref_type=tags" | yq eval '.sources[0].url' | cut -d : -f 2 | cut -d - -f 2 | cut -c -6)
44+
webkitgtk_version=$(git ls-remote --refs --sort='v:refname' --tags 'https://github.com/WebKit/WebKit.git' "webkitgtk-*" | awk -F'/' '{print $NF}' | grep -E 'webkitgtk-[0-9]+(\.[0-9]+)*\.[0-9]$' | sort -V | tail -n 1 | sed 's/^webkitgtk-//')
4645
yq -i ".version=\"$webkitgtk_version\"" webkitgtk-6-gnome-2404/snapcraft.yaml

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<ul>
1212
<a href="https://snapcraft.io/webkitgtk-6-gnome-2204-sdk"><img src="https://snapcraft.io/webkitgtk-6-gnome-2204-sdk/badge.svg" alt="WebKitGTK SDK Status"></a>
13-
<a href="https://github.com/snapcrafters/webkitgtk-sdk/actions/workflows/update-sdk-snap.yml"><img src="https://github.com/snapcrafters/webkitgtk-sdk/actions/workflows/update-sdk-snap.yml/badge.svg"></a>
13+
<a href="https://github.com/snapcrafters/webkitgtk-sdk/actions/workflows/update-snap.yml"><img src="https://github.com/snapcrafters/webkitgtk-sdk/actions/workflows/update-snap.yml/badge.svg"></a>
1414

1515
<a href="https://github.com/snapcrafters/webkitgtk-sdk/actions/workflows/release-sdk-to-candidate.yaml"><img src="https://github.com/snapcrafters/webkitgtk-sdk/actions/workflows/release-sdk-to-candidate.yml/badge.svg"></a>
1616
<a href="https://github.com/snapcrafters/webkitgtk-sdk/actions/workflows/promote-to-stable.yml"><img src="https://github.com/snapcrafters/webkitgtk-sdk/actions/workflows/promote-to-stable.yml/badge.svg"></a>
@@ -21,7 +21,7 @@
2121

2222
<ul>
2323
<a href="https://snapcraft.io/webkitgtk-6-gnome-2204"><img src="https://snapcraft.io/webkitgtk-6-gnome-2204/badge.svg" alt="WebKitGTK Content Snap Status"></a>
24-
<a href="https://github.com/snapcrafters/webkitgtk-sdk/actions/workflows/update-sdk-snap.yml"><img src="https://github.com/snapcrafters/webkitgtk-sdk/actions/workflows/update-sdk-snap.yml/badge.svg"></a>
24+
<a href="https://github.com/snapcrafters/webkitgtk-sdk/actions/workflows/update-snap.yml"><img src="https://github.com/snapcrafters/webkitgtk-sdk/actions/workflows/update-snap.yml/badge.svg"></a>
2525
<a href="https://github.com/snapcrafters/webkitgtk-sdk/actions/workflows/release-content-to-candidate.yaml"><img src="https://github.com/snapcrafters/webkitgtk-sdk/actions/workflows/release-content-to-candidate.yml/badge.svg"></a>
2626
<a href="https://github.com/snapcrafters/webkitgtk-sdk/actions/workflows/promote-to-stable.yml"><img src="https://github.com/snapcrafters/webkitgtk-sdk/actions/workflows/promote-to-stable.yml/badge.svg"></a>
2727
</ul>

webkitgtk-6-gnome-2404/snapcraft.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: webkitgtk-6-gnome-2404
22
base: core24
3-
version: "2.48.3"
3+
version: "2.49.2"
44
summary: Web content engine for GTK
55
description: |
66
Content snap for Webkitgtk-6.0+

0 commit comments

Comments
 (0)