Skip to content

Commit 82ca915

Browse files
authored
Merge branch 'master' into purple-share
2 parents 1a44db2 + 0b91054 commit 82ca915

File tree

242 files changed

+27528
-21151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

242 files changed

+27528
-21151
lines changed

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"

.github/workflows/main.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,14 @@ jobs:
1111
build:
1212

1313
runs-on: ubuntu-latest
14-
14+
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
version: [stable, unstable, development-target]
1519
container:
16-
image: elementary/docker:next-unstable
17-
20+
image: ghcr.io/elementary/docker:${{ matrix.version }}
21+
1822
steps:
1923
- uses: actions/checkout@v3
2024
- name: Install Dependencies

.github/workflows/merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
build:
1212
runs-on: ubuntu-22.04
1313
container:
14-
image: elementary/docker:next-unstable
14+
image: ghcr.io/elementary/docker:next-unstable
1515

1616
steps:
1717
- name: Install git

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: Release
22

33
on:
44
pull_request:
5-
branches: master
6-
types: closed
5+
branches: [master]
6+
types: [closed]
77
jobs:
88
release:
99
runs-on: ubuntu-latest
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pan-up-symbolic.svg
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
view-pin-symbolic.svg
Lines changed: 15 additions & 0 deletions
Loading
Lines changed: 15 additions & 0 deletions
Loading

categories/32/preferences-desktop-display.svg

Lines changed: 84 additions & 149 deletions
Loading

0 commit comments

Comments
 (0)