Skip to content

Commit cee7d0a

Browse files
authored
Merge branch 'main' into fix-issue-627-download-data-empty-state
2 parents 319c81e + 1e6b92b commit cee7d0a

4 files changed

Lines changed: 35 additions & 10 deletions

File tree

.github/workflows/pr_ci_license_header_check.yaml renamed to .github/workflows/ci_license_header_check.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1-
name: pr_ci_license_header_check
1+
name: ci_license_header_check
22
on:
33
pull_request:
44
branches:
55
- main
6-
types: [opened, reopened, synchronize]
6+
types:
7+
- opened
8+
- reopened
9+
- synchronize
10+
push:
11+
branches:
12+
- main
713

814
jobs:
915
license_header_check:
Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1-
name: pr_swiftlint
1+
name: ci_swiftlint
22
on:
33
pull_request:
44
branches:
55
- main
6-
types: [opened, reopened, synchronize]
6+
types:
7+
- opened
8+
- reopened
9+
- synchronize
10+
push:
11+
branches:
12+
- main
713

814
jobs:
915
swiftlint:
Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1-
name: pr_ci
1+
name: ci_test
22
on:
33
pull_request:
44
branches:
55
- main
6-
types: [opened, reopened, synchronize]
6+
types:
7+
- opened
8+
- reopened
9+
- synchronize
10+
push:
11+
branches:
12+
- main
713

814
jobs:
915
test:

.github/workflows/pr_maintainer_checklist.yaml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,16 @@ jobs:
1717
uses: thollander/actions-comment-pull-request@v2
1818
with:
1919
message: |
20-
## Thank you for the pull request! 💙
20+
## Thank you for the pull request! 💙🩵
2121
22-
The Scribe-iOS team will do our best to address your contribution as soon as we can. If you're not already a member of our [public Matrix community](https://matrix.to/#/#scribe_community:matrix.org), please consider joining! We'd suggest that you use the [Element](https://element.io/) client as well as [Element X](https://element.io/app) for a mobile app, and definitely join the `General` and `iOS` rooms once you're in. Also consider attending our [bi-weekly Saturday dev syncs](https://etherpad.wikimedia.org/p/scribe-dev-sync). It'd be great to meet you 😊
22+
The Scribe-iOS team will do our best to address your contribution as soon as we can. The following are some important points:
23+
- Those interested in developing their skills and expanding their role in the community should read the [mentorship and growth section of the contribution guide](https://github.com/scribe-org/Scribe-iOS/blob/main/CONTRIBUTING.md#mentorship-and-growth)
24+
- If you're not already a member of our [public Matrix community](https://matrix.to/#/#scribe_community:matrix.org), please consider joining!
25+
- We'd suggest that you use the [Element](https://element.io/) client as well as [Element X](https://element.io/app) for a mobile app
26+
- Join the `General` and `iOS` rooms once you're in
27+
- Also consider attending our bi-weekly Saturday developer syncs!
28+
- Details are shared in the `General` room on Matrix each Wednesday before the sync
29+
- It would be great to meet you 😊
2330
2431
> [!NOTE]
2532
> Scribe uses [Conventional Comments](https://conventionalcomments.org/) in reviews to make sure that communication is as clear as possible.
@@ -45,5 +52,5 @@ jobs:
4552
## First PR Commit Check
4653
4754
- [ ] The commit messages for the remote branch should be checked to make sure the contributor's email is set up correctly so that they receive credit for their contribution
48-
- The contributor's name and icon in remote commits should be the same as what appears in the PR
49-
- If there's a mismatch, the contributor needs to make sure that the [email they use for GitHub](https://github.com/settings/emails) matches what they have for `git config user.email` in their local Scribe-iOS repo (can be set with `git config --global user.email "GITHUB_EMAIL"`)
55+
- The contributor's name and icon in remote commits should be the same as what appears in the PR
56+
- If there's a mismatch, the contributor needs to make sure that the [email they use for GitHub](https://github.com/settings/emails) matches what they have for `git config user.email` in their local Scribe-iOS repo (can be set with `git config --global user.email "GITHUB_EMAIL"`)

0 commit comments

Comments
 (0)