From eb9fc579d36b96ddfaa87f05e8659e99afff25e7 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florian.renaud@niji.fr>
Date: Tue, 4 Jan 2022 11:19:30 +0100
Subject: [PATCH] Fix malformed comments and code review
---
.github/workflows/triage-incoming.yml | 6 ++--
.github/workflows/triage-move-labelled.yml | 31 ++++++++++++--------
.github/workflows/triage-move-unlabelled.yml | 7 +++--
.github/workflows/triage-priority-bugs.yml | 12 ++++----
4 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/.github/workflows/triage-incoming.yml b/.github/workflows/triage-incoming.yml
index 3bb5ab73aa..6a22bf5223 100644
--- a/.github/workflows/triage-incoming.yml
+++ b/.github/workflows/triage-incoming.yml
@@ -2,13 +2,13 @@ name: Move new issues onto Issue triage board
on:
issues:
- types: [ opened ]
+ types: [opened]
jobs:
automate-project-columns:
runs-on: ubuntu-latest
- if: |
- github.repository == 'vector-im/element-android' # Skip in forks
+ # Skip in forks
+ if: github.repository == 'vector-im/element-android'
steps:
- uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
with:
diff --git a/.github/workflows/triage-move-labelled.yml b/.github/workflows/triage-move-labelled.yml
index 96d302ceea..e2f5cc32e9 100644
--- a/.github/workflows/triage-move-labelled.yml
+++ b/.github/workflows/triage-move-labelled.yml
@@ -2,14 +2,14 @@ name: Move labelled issues to correct boards and columns
on:
issues:
- types: [ labeled ]
+ types: [labeled]
jobs:
move_needs_info_issues:
name: X-Needs-Info issues to Need info column on triage board
runs-on: ubuntu-latest
- if: |
- github.repository == 'vector-im/element-android' # Skip in forks
+ # Skip in forks
+ if: github.repository == 'vector-im/element-android'
steps:
- uses: konradpabjan/move-labeled-or-milestoned-issue@219d384e03fa4b6460cd24f9f37d19eb033a4338
with:
@@ -21,8 +21,9 @@ jobs:
add_priority_design_issues_to_project:
name: P1 X-Needs-Design to Design project board
runs-on: ubuntu-latest
- if: |
- github.repository == 'vector-im/element-android' && # Skip in forks
+ # Skip in forks
+ if: >
+ github.repository == 'vector-im/element-android' &&
contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
(contains(github.event.issue.labels.*.name, 'S-Critical') &&
(contains(github.event.issue.labels.*.name, 'O-Frequent') ||
@@ -53,8 +54,9 @@ jobs:
# delight_issues_to_board:
# name: Spaces issues to new Delight project board
# runs-on: ubuntu-latest
- # if: |
- # github.repository == 'vector-im/element-android' && # Skip in forks
+ # # Skip in forks
+ # if: >
+ # github.repository == 'vector-im/element-android' &&
# contains(github.event.issue.labels.*.name, 'A-Spaces') ||
# contains(github.event.issue.labels.*.name, 'A-Space-Settings') ||
# contains(github.event.issue.labels.*.name, 'A-Subspaces')
@@ -79,8 +81,9 @@ jobs:
move_voice-message_issues:
name: A-Voice Messages to voice message board
runs-on: ubuntu-latest
- if: |
- github.repository == 'vector-im/element-android' && # Skip in forks
+ # Skip in forks
+ if: >
+ github.repository == 'vector-im/element-android' &&
contains(github.event.issue.labels.*.name, 'A-Voice Messages')
steps:
- uses: octokit/graphql-action@v2.x
@@ -103,8 +106,9 @@ jobs:
move_threads_issues:
name: A-Threads to Thread board
runs-on: ubuntu-latest
- if: |
- github.repository == 'vector-im/element-android' && # Skip in forks
+ # Skip in forks
+ if: >
+ github.repository == 'vector-im/element-android' &&
contains(github.event.issue.labels.*.name, 'A-Threads')
steps:
- uses: octokit/graphql-action@v2.x
@@ -127,8 +131,9 @@ jobs:
move_message_bubbles_issues:
name: A-Message-Bubbles to Message bubbles board
runs-on: ubuntu-latest
- if: |
- github.repository == 'vector-im/element-android' && # Skip in forks
+ # Skip in forks
+ if: >
+ github.repository == 'vector-im/element-android' &&
contains(github.event.issue.labels.*.name, 'A-Message-Bubbles')
steps:
- uses: octokit/graphql-action@v2.x
diff --git a/.github/workflows/triage-move-unlabelled.yml b/.github/workflows/triage-move-unlabelled.yml
index 5f13165939..eb90cdb503 100644
--- a/.github/workflows/triage-move-unlabelled.yml
+++ b/.github/workflows/triage-move-unlabelled.yml
@@ -2,14 +2,15 @@ name: Move unlabelled from needs info columns to triaged
on:
issues:
- types: [ unlabeled ]
+ types: [unlabeled]
jobs:
Move_Unabeled_Issue_On_Project_Board:
name: Move no longer X-Needs-Info issues to Triaged
runs-on: ubuntu-latest
- if: |
- github.repository == 'vector-im/element-android' && # Skip in forks
+ # Skip in forks
+ if: >
+ github.repository == 'vector-im/element-android' &&
!contains(github.event.issue.labels.*.name, 'X-Needs-Info')
env:
BOARD_NAME: "Issue triage"
diff --git a/.github/workflows/triage-priority-bugs.yml b/.github/workflows/triage-priority-bugs.yml
index 7564387a1c..daea78de19 100644
--- a/.github/workflows/triage-priority-bugs.yml
+++ b/.github/workflows/triage-priority-bugs.yml
@@ -2,13 +2,14 @@ name: Move P1 bugs to boards
on:
issues:
- types: [ labeled, unlabeled ]
+ types: [labeled, unlabeled]
jobs:
p1_issues_to_team_workboard:
runs-on: ubuntu-latest
- if: |
- github.repository == 'vector-im/element-android' && # Skip in forks
+ # Skip in forks
+ if: >
+ github.repository == 'vector-im/element-android' &&
(!contains(github.event.issue.labels.*.name, 'A-E2EE') &&
!contains(github.event.issue.labels.*.name, 'A-E2EE-Cross-Signing') &&
!contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') &&
@@ -34,8 +35,9 @@ jobs:
P1_issues_to_crypto_team_workboard:
runs-on: ubuntu-latest
- if: |
- github.repository == 'vector-im/element-android' && # Skip in forks
+ # Skip in forks
+ if: >
+ github.repository == 'vector-im/element-android' &&
(contains(github.event.issue.labels.*.name, 'A-E2EE') ||
contains(github.event.issue.labels.*.name, 'A-E2EE-Cross-Signing') ||
contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||