Skip to content
This repository was archived by the owner on Dec 27, 2024. It is now read-only.

Commit 846aaee

Browse files
authored
Merge branch 'main' into feat/docs
2 parents e984918 + e9fa043 commit 846aaee

File tree

3 files changed

+51
-8
lines changed

3 files changed

+51
-8
lines changed

.github/workflows/cleanup.yml

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Cleanup cache
2+
on:
3+
pull_request:
4+
types:
5+
- closed
6+
workflow_dispatch:
7+
inputs:
8+
branch:
9+
description: 'Branch ref to delete caches for'
10+
required: true
11+
type: string
12+
13+
jobs:
14+
cleanup:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Check out code
18+
uses: actions/checkout@v4
19+
20+
- name: Cleanup cache
21+
run: |
22+
gh extension install actions/gh-actions-cache
23+
24+
REPO=${{ github.server_url }}/${{ github.repository }}
25+
REF=${{ github.event.pull_request.number }}
26+
BRANCH=${{ inputs.branch || 'refs/pull/$REF/merge' }}
27+
28+
echo "Fetching list of cache key"
29+
echo $BRANCH
30+
cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH | cut -f 1 )
31+
echo $cacheKeysForPR
32+
33+
## Setting this to not fail the workflow while deleting cache keys.
34+
set +e
35+
echo "Deleting caches..."
36+
for cacheKey in $cacheKeysForPR
37+
do
38+
gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
39+
done
40+
echo "Done"
41+
env:
42+
GH_TOKEN: ${{ github.token }}

package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
22
"name": "mmm-v2",
3-
"version": "24.10.4",
4-
"description": "A cross platform app to download and present media for congregation meetings of Jehovah's Witnesses.",
53
"homepage": "https://sircharlo.github.io/mmm-refactor/",
64
"bugs": "https://github.com/sircharlo/mmm-refactor/issues",
75
"repository": {
86
"type": "git",
97
"url": "https://github.com/sircharlo/mmm-refactor.git"
108
},
9+
"version": "24.10.5",
10+
"description": "A cross platform app to download and present media for congregation meetings of Jehovah’s Witnesses.",
11+
"productName": "Meeting Media Manager",
1112
"author": "Olivier Savignac",
1213
"private": true,
1314
"scripts": {
@@ -24,7 +25,7 @@
2425
},
2526
"dependencies": {
2627
"@electron/remote": "^2.1.2",
27-
"@formkit/drag-and-drop": "^0.2.3",
28+
"@formkit/drag-and-drop": "^0.2.4",
2829
"@panzoom/panzoom": "^4.5.1",
2930
"@quasar/cli": "^2.4.1",
3031
"@quasar/extras": "^1.16.12",

yarn.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -851,10 +851,10 @@ __metadata:
851851
languageName: node
852852
linkType: hard
853853

854-
"@formkit/drag-and-drop@npm:^0.2.3":
855-
version: 0.2.3
856-
resolution: "@formkit/drag-and-drop@npm:0.2.3"
857-
checksum: 10c0/d073e6ca3335a069c41e12d1313dc62854c836ee2730130a0d4bbe882929f35b66d873594b896b4867146683eee04d9bd3505b812a16da6d33484fb513f71f86
854+
"@formkit/drag-and-drop@npm:^0.2.4":
855+
version: 0.2.4
856+
resolution: "@formkit/drag-and-drop@npm:0.2.4"
857+
checksum: 10c0/2e1cb181634c546fc971e9565e58155e576309d87c4413a7ab43750f8929d4229cf40c1cbcce29177f5a3f138ef6300b1b8f07e3d99001f2ab1f3bf6674c7529
858858
languageName: node
859859
linkType: hard
860860

@@ -9096,7 +9096,7 @@ __metadata:
90969096
"@daipeng7/rollup-plugin-iconfont": "npm:^3.0.6"
90979097
"@electron/rebuild": "npm:^3.7.0"
90989098
"@electron/remote": "npm:^2.1.2"
9099-
"@formkit/drag-and-drop": "npm:^0.2.3"
9099+
"@formkit/drag-and-drop": "npm:^0.2.4"
91009100
"@intlify/vite-plugin-vue-i18n": "npm:^7.0.0"
91019101
"@panzoom/panzoom": "npm:^4.5.1"
91029102
"@quasar/app-vite": "npm:^1.10.0"

0 commit comments

Comments
 (0)