Skip to content

Commit cdb1bf7

Browse files
committed
Merge remote-tracking branch 'origin/master' into arc-gizmos
2 parents 07d104e + a182a73 commit cdb1bf7

146 files changed

Lines changed: 4804 additions & 3263 deletions

File tree

Some content is hidden

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

.github/workflows/build-dev-and-ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ on:
55
branches:
66
- master
77
pull_request:
8-
branches:
9-
- master
108
env:
119
CARGO_TERM_COLOR: always
1210
INDEX_HTML_HEAD_REPLACEMENT: <script defer data-domain="dev.graphite.rs" data-api="https://graphite.rs/visit/event" src="https://graphite.rs/visit/script.hash.js"></script>

.github/workflows/comment-clippy-warnings.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: Clippy Check
22

33
on:
44
pull_request:
5-
branches: [master]
65
types: [opened, reopened, synchronize, ready_for_review]
76

87
jobs:

.github/workflows/comment-profiling-changes.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: Profiling Changes
22

33
on:
44
pull_request:
5-
branches: [master]
65

76
env:
87
CARGO_TERM_COLOR: always

.github/workflows/library-rawkit.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ on:
77
paths:
88
- "libraries/rawkit/**"
99
pull_request:
10-
branches:
11-
- master
1210
paths:
1311
- "libraries/rawkit/**"
1412

.github/workflows/website.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ on:
77
paths:
88
- website/**
99
pull_request:
10-
branches:
11-
- master
1210
paths:
1311
- website/**
1412
env:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ perf.data*
55
profile.json
66
flamegraph.svg
77
.idea/
8+
.direnv

.nix/flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
libraw
5252

5353

54-
# Tauri dependencies: keep in sync with https://v2.tauri.app/start/prerequisites/
54+
# Tauri dependencies: keep in sync with https://v2.tauri.app/start/prerequisites/#system-dependencies (under the NixOS tab)
5555
at-spi2-atk
5656
atkmm
5757
cairo

0 commit comments

Comments
 (0)