mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-12-23 21:01:25 +01:00
Merge branch 'master' of https://github.com/DCC-EX/CommandStation-EX into HEAD
This commit is contained in:
commit
912646f8ff
61
.github/workflows/new-items.yml
vendored
61
.github/workflows/new-items.yml
vendored
@ -13,7 +13,7 @@ on:
|
|||||||
issues:
|
issues:
|
||||||
types:
|
types:
|
||||||
- opened
|
- opened
|
||||||
pull_request:
|
pull_request_target:
|
||||||
types:
|
types:
|
||||||
- ready_for_review
|
- ready_for_review
|
||||||
- opened
|
- opened
|
||||||
@ -42,26 +42,35 @@ jobs:
|
|||||||
gh api graphql -f query='
|
gh api graphql -f query='
|
||||||
query($org: String!, $number: Int!) {
|
query($org: String!, $number: Int!) {
|
||||||
organization(login: $org){
|
organization(login: $org){
|
||||||
projectNext(number: $number) {
|
projectV2(number: $number) {
|
||||||
id
|
id
|
||||||
fields(first:20) {
|
fields(first:20) {
|
||||||
nodes {
|
nodes {
|
||||||
id
|
... on ProjectV2Field {
|
||||||
name
|
id
|
||||||
settings
|
name
|
||||||
|
}
|
||||||
|
... on ProjectV2SingleSelectField {
|
||||||
|
id
|
||||||
|
name
|
||||||
|
options {
|
||||||
|
id
|
||||||
|
name
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}' -f org=$ORG -F number=$PROJECT_NUMBER > project_data.json
|
}' -f org=$ORG -F number=$PROJECT_NUMBER > project_data.json
|
||||||
|
|
||||||
echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
|
echo 'PROJECT_ID='$(jq '.data.organization.projectV2.id' project_data.json) >> $GITHUB_ENV
|
||||||
echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
|
echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
|
||||||
echo 'BACKLOG_OPTION_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.settings | fromjson.options[] | select(.name=="Backlog") |.id' project_data.json) >> $GITHUB_ENV
|
echo 'BACKLOG_OPTION_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") |.options[] | select(.name=="Backlog") |.id' project_data.json) >> $GITHUB_ENV
|
||||||
echo 'TO_DO_OPTION_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.settings | fromjson.options[] | select(.name=="To Do") |.id' project_data.json) >> $GITHUB_ENV
|
echo 'TO_DO_OPTION_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") |.options[] | select(.name=="To Do") |.id' project_data.json) >> $GITHUB_ENV
|
||||||
echo 'NEEDS_REVIEW_OPTION_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.settings | fromjson.options[] | select(.name=="Needs Review") |.id' project_data.json) >> $GITHUB_ENV
|
echo 'NEEDS_REVIEW_OPTION_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") |.options[] | select(.name=="Needs Review") |.id' project_data.json) >> $GITHUB_ENV
|
||||||
echo 'IN_PROGRESS_OPTION_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.settings | fromjson.options[] | select(.name=="In Progress") |.id' project_data.json) >> $GITHUB_ENV
|
echo 'IN_PROGRESS_OPTION_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") |.options[] | select(.name=="In Progress") |.id' project_data.json) >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Add issue to project
|
- name: Add issue to project
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
|
GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
|
||||||
@ -70,12 +79,12 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
project_item_id="$( gh api graphql -f query='
|
project_item_id="$( gh api graphql -f query='
|
||||||
mutation($project:ID!, $item:ID!) {
|
mutation($project:ID!, $item:ID!) {
|
||||||
addProjectNextItem(input: {projectId: $project, contentId: $item}) {
|
addProjectV2ItemById(input: {projectId: $project, contentId: $item}) {
|
||||||
projectNextItem {
|
item {
|
||||||
id
|
id
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}' -f project=$PROJECT_ID -f item=$ITEM_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
|
}' -f project=$PROJECT_ID -f item=$ITEM_ID --jq '.data.addProjectV2ItemById.item.id')"
|
||||||
echo 'PROJECT_ITEM_ID='$project_item_id >> $GITHUB_ENV
|
echo 'PROJECT_ITEM_ID='$project_item_id >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Add PR to project
|
- name: Add PR to project
|
||||||
@ -86,12 +95,12 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
project_item_id="$( gh api graphql -f query='
|
project_item_id="$( gh api graphql -f query='
|
||||||
mutation($project:ID!, $item:ID!) {
|
mutation($project:ID!, $item:ID!) {
|
||||||
addProjectNextItem(input: {projectId: $project, contentId: $item}) {
|
addProjectV2ItemById(input: {projectId: $project, contentId: $item}) {
|
||||||
projectNextItem {
|
item {
|
||||||
id
|
id
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}' -f project=$PROJECT_ID -f item=$ITEM_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
|
}' -f project=$PROJECT_ID -f item=$ITEM_ID --jq '.data.addProjectV2ItemById.item.id')"
|
||||||
echo 'PROJECT_ITEM_ID='$project_item_id >> $GITHUB_ENV
|
echo 'PROJECT_ITEM_ID='$project_item_id >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Set status - To Do
|
- name: Set status - To Do
|
||||||
@ -106,13 +115,15 @@ jobs:
|
|||||||
$status_field: ID!
|
$status_field: ID!
|
||||||
$status_value: String!
|
$status_value: String!
|
||||||
){
|
){
|
||||||
set_status: updateProjectNextItemField(input: {
|
set_status: updateProjectV2ItemFieldValue(input: {
|
||||||
projectId: $project
|
projectId: $project
|
||||||
itemId: $item
|
itemId: $item
|
||||||
fieldId: $status_field
|
fieldId: $status_field
|
||||||
value: $status_value
|
value: {
|
||||||
|
singleSelectOptionId: $status_value
|
||||||
|
}
|
||||||
}) {
|
}) {
|
||||||
projectNextItem {
|
projectV2Item {
|
||||||
id
|
id
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -130,13 +141,15 @@ jobs:
|
|||||||
$status_field: ID!
|
$status_field: ID!
|
||||||
$status_value: String!
|
$status_value: String!
|
||||||
){
|
){
|
||||||
set_status: updateProjectNextItemField(input: {
|
set_status: updateProjectV2ItemFieldValue(input: {
|
||||||
projectId: $project
|
projectId: $project
|
||||||
itemId: $item
|
itemId: $item
|
||||||
fieldId: $status_field
|
fieldId: $status_field
|
||||||
value: $status_value
|
value: {
|
||||||
|
singleSelectOptionId: $status_value
|
||||||
|
}
|
||||||
}) {
|
}) {
|
||||||
projectNextItem {
|
projectV2Item {
|
||||||
id
|
id
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
// UNO Progmem optimized to allow for small EXRAIL Automation scipts
|
// UNO Progmem optimized to allow for small EXRAIL Automation scipts
|
||||||
// 4.0.2 Command Station and EX-RAIL Ehancements & Additions:
|
// 4.0.2 Command Station and EX-RAIL Ehancements & Additions:
|
||||||
// New JA, JR, JT commands availabe for Throttle Developers to obtain Route, Roster and Turnout descriptions for communications
|
// New JA, JR, JT commands availabe for Throttle Developers to obtain Route, Roster and Turnout descriptions for communications
|
||||||
// Change ACK defaults now set to LIMIT 50mA, MIN 2000uS, MAX 2000uS for more compatibility with non NMRA compliant decoders
|
// Change ACK defaults now set to LIMIT 50mA, MIN 2000uS, MAX 20000uS for more compatibility with non NMRA compliant decoders
|
||||||
// New Commands for the Arduino IDE Serial Monitor and JMRI DCC++ Traffic Monitor
|
// New Commands for the Arduino IDE Serial Monitor and JMRI DCC++ Traffic Monitor
|
||||||
// </RED signal_id> to turn a individual LED Signal On & Off
|
// </RED signal_id> to turn a individual LED Signal On & Off
|
||||||
// </AMBER signal_id> "
|
// </AMBER signal_id> "
|
||||||
|
Loading…
Reference in New Issue
Block a user