aboutsummaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
Diffstat (limited to '.github')
-rw-r--r--.github/ISSUE_TEMPLATE/bug-report.yaml6
-rw-r--r--.github/ISSUE_TEMPLATE/issue-report.yaml6
-rw-r--r--.github/workflows/docker.yml4
-rw-r--r--.github/workflows/format.yml2
-rw-r--r--.github/workflows/main.yml4
-rw-r--r--.github/workflows/pr-comment.yml2
6 files changed, 12 insertions, 12 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml
index 4c85742a..f032d034 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yaml
@@ -41,10 +41,10 @@ body:
attributes:
label: Version
description: |
- What [version of the firmware](https://github.com/JF002/InfiniTime/blob/develop/doc/gettingStarted/gettingStarted-1.0.md#how-to-check-the-version-of-infinitime-and-the-bootloader) are you running?
- If you are running an older version, please consider [updating to the latest firmware](https://github.com/JF002/InfiniTime/blob/develop/doc/gettingStarted/gettingStarted-1.0.md#how-to-update-your-pinetime).
+ What [version of the firmware](https://github.com/InfiniTimeOrg/InfiniTime/blob/main/doc/gettingStarted/updating-software.md#checking-the-version-of-infinitime) are you running?
+ If you are running an older version, please consider [updating to the latest firmware](https://github.com/InfiniTimeOrg/InfiniTime/blob/main/doc/gettingStarted/updating-software.md#updating-with-companion-apps).
If you are running directly from git, specify the branch or the commit hash directly.
- placeholder: "Ex. v1.6.0 or develop or fc922b60"
+ placeholder: "Ex. v1.11.0 or main or fc922b60"
validations:
required: true
- type: input
diff --git a/.github/ISSUE_TEMPLATE/issue-report.yaml b/.github/ISSUE_TEMPLATE/issue-report.yaml
index f46499aa..05cca32c 100644
--- a/.github/ISSUE_TEMPLATE/issue-report.yaml
+++ b/.github/ISSUE_TEMPLATE/issue-report.yaml
@@ -23,9 +23,9 @@ body:
attributes:
label: Version
description: |
- What [version of the firmware](https://github.com/JF002/InfiniTime/blob/develop/doc/gettingStarted/gettingStarted-1.0.md#how-to-check-the-version-of-infinitime-and-the-bootloader) are you running?
- If you are running an older version, please consider [updating to the latest firmware](https://github.com/JF002/InfiniTime/blob/develop/doc/gettingStarted/gettingStarted-1.0.md#how-to-update-your-pinetime).
+ What [version of the firmware](https://github.com/InfiniTimeOrg/InfiniTime/blob/main/doc/gettingStarted/updating-software.md#checking-the-version-of-infinitime) are you running?
+ If you are running an older version, please consider [updating to the latest firmware](https://github.com/InfiniTimeOrg/InfiniTime/blob/main/doc/gettingStarted/updating-software.md#updating-with-companion-apps).
If you are running directly from git, specify the branch or the commit hash directly.
- placeholder: Ex. v1.6.0 or develop or fc922b60
+ placeholder: Ex. v1.11.0 or main or fc922b60
validations:
required: false
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 7af81515..560e4433 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -2,11 +2,11 @@ name: Build and push Docker image
on:
push:
- branches: [ develop ]
+ branches: [ main ]
paths:
- 'docker/**'
pull_request:
- branches: [ develop ]
+ branches: [ main ]
paths:
- 'docker/**'
# Allows you to run this workflow manually from the Actions tab
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 32451a0b..71c05fa2 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -2,7 +2,7 @@ name: Code formatting
on:
pull_request:
- branches: [ develop ]
+ branches: [ main ]
paths:
- '**.cpp'
- '**.h'
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e416a7c8..89c1b276 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,12 +3,12 @@ name: CI
# Run this workflow whenever the build may be affected
on:
push:
- branches: [ master, develop ]
+ branches: [ main ]
paths-ignore:
- 'doc/**'
- '**.md'
pull_request:
- branches: [ develop ]
+ branches: [ main ]
paths-ignore:
- 'doc/**'
- '**.md'
diff --git a/.github/workflows/pr-comment.yml b/.github/workflows/pr-comment.yml
index 9f3d2880..15f0c02d 100644
--- a/.github/workflows/pr-comment.yml
+++ b/.github/workflows/pr-comment.yml
@@ -5,7 +5,7 @@ name: PR comment
on:
pull_request_target:
- branches: [ develop ]
+ branches: [ main ]
paths-ignore:
- 'doc/**'
- '**.md'