From 27ae5ad2d1da5923e5312a3132b984d0d39b958a Mon Sep 17 00:00:00 2001 From: Ben Jarmak Date: Wed, 14 May 2025 14:24:22 -0400 Subject: [PATCH 1/7] Replace all `-F` usage with `-f` --- .github/workflows/project-get-item-id.yaml | 4 +++ .../project-get-set-iteration-field.yaml | 11 +++++++ .../project-get-set-single-select-field.yaml | 18 ++++++++++ .../project-set-text-date-numeric-field.yaml | 15 +++++++++ .../project-update-linked-issues.yaml | 33 +++++++++++++++++++ 5 files changed, 81 insertions(+) diff --git a/.github/workflows/project-get-item-id.yaml b/.github/workflows/project-get-item-id.yaml index d80926ee..49b287b8 100644 --- a/.github/workflows/project-get-item-id.yaml +++ b/.github/workflows/project-get-item-id.yaml @@ -50,8 +50,12 @@ jobs: # Query up to 10 projects for the PR # There's no graphQL filter configured to query by a specific project # So we need to query all projects and filter the result ourselves +<<<<<<< HEAD # shellcheck disable=SC2016 gh api graphql -F nodeId="$ENV_ITEM_NODE_ID" -f query=' +======= + gh api graphql -f nodeId="$ENV_ITEM_NODE_ID" -f query=' +>>>>>>> 861fe12 (Replace all `-F` usage with `-f`) query($nodeId: ID!) { node(id: $nodeId) { ... on PullRequest { diff --git a/.github/workflows/project-get-set-iteration-field.yaml b/.github/workflows/project-get-set-iteration-field.yaml index 1e71e96f..cc0ee314 100644 --- a/.github/workflows/project-get-set-iteration-field.yaml +++ b/.github/workflows/project-get-set-iteration-field.yaml @@ -69,8 +69,12 @@ jobs: run: | # Get current iteration iteration id # The current iteration is always the first element in the returned list +<<<<<<< HEAD # shellcheck disable=SC2016 gh api graphql -F projectId="$ENV_PROJECT_ID" -F fieldName="$ENV_ITERATION_FIELD_NAME" -f query=' +======= + gh api graphql -f projectId="$ENV_PROJECT_ID" -f fieldName="$ENV_ITERATION_FIELD_NAME" -f query=' +>>>>>>> 861fe12 (Replace all `-F` usage with `-f`) query($projectId: ID!, $fieldName: String!) { node(id: $projectId) { ... on ProjectV2 { @@ -105,11 +109,18 @@ jobs: ENV_ITERATION_FIELD_ID: ${{ inputs.ITERATION_FIELD_ID }} ENV_ITERATION_OPTION_ID: ${{ steps.get_iteration_option_id.outputs.ITERATION_OPTION_ID }} run: | +<<<<<<< HEAD # shellcheck disable=SC2016 gh api graphql -F projectId="$ENV_PROJECT_ID" \ -F itemId="$ENV_ITEM_PROJECT_ID" \ -F fieldId="$ENV_ITERATION_FIELD_ID" \ -F iterationId="$ENV_ITERATION_OPTION_ID" \ +======= + gh api graphql -f projectId="$ENV_PROJECT_ID" \ + -f itemId="$ENV_ITEM_PROJECT_ID" \ + -f fieldId="$ENV_ITERATION_FIELD_ID" \ + -f iterationId="$ENV_ITERATION_OPTION_ID" \ +>>>>>>> 861fe12 (Replace all `-F` usage with `-f`) -f query=' mutation($projectId: ID!, $itemId: ID!, $fieldId: ID!, $iterationId: String!) { updateProjectV2ItemFieldValue( diff --git a/.github/workflows/project-get-set-single-select-field.yaml b/.github/workflows/project-get-set-single-select-field.yaml index 033d6210..c66b071f 100644 --- a/.github/workflows/project-get-set-single-select-field.yaml +++ b/.github/workflows/project-get-set-single-select-field.yaml @@ -77,9 +77,14 @@ jobs: # Get single_select option id if [ -z "$ENV_SINGLE_SELECT_OPTION_VALUE" ]; then # No option specified, get first option in list +<<<<<<< HEAD # shellcheck disable=SC2016 gh api graphql -F projectId="$ENV_PROJECT_ID" \ -F fieldName="$ENV_SINGLE_SELECT_FIELD_NAME" \ +======= + gh api graphql -f projectId="$ENV_PROJECT_ID" \ + -f fieldName="$ENV_SINGLE_SELECT_FIELD_NAME" \ +>>>>>>> 861fe12 (Replace all `-F` usage with `-f`) -f query=' query($projectId: ID!, $fieldName: String!) { node(id: $projectId) { @@ -94,10 +99,16 @@ jobs: }' > single_select_option_data.json else # Get specific value +<<<<<<< HEAD # shellcheck disable=SC2016 gh api graphql -F projectId="$ENV_PROJECT_ID" \ -F fieldName="$ENV_SINGLE_SELECT_FIELD_NAME" \ -F optionName="$ENV_SINGLE_SELECT_OPTION_VALUE" \ +======= + gh api graphql -f projectId="$ENV_PROJECT_ID" \ + -f fieldName="$ENV_SINGLE_SELECT_FIELD_NAME" \ + -f optionName="$ENV_SINGLE_SELECT_OPTION_VALUE" \ +>>>>>>> 861fe12 (Replace all `-F` usage with `-f`) -f query=' query($projectId: ID!, $fieldName: String!, $optionName: String!) { node(id: $projectId) { @@ -127,11 +138,18 @@ jobs: ENV_SINGLE_SELECT_FIELD_ID: ${{ inputs.SINGLE_SELECT_FIELD_ID }} ENV_SINGLE_SELECT_OPTION_ID: ${{ steps.get_single_select_option_id.outputs.SINGLE_SELECT_OPTION_ID }} run: | +<<<<<<< HEAD # shellcheck disable=SC2016 gh api graphql -F projectId="$ENV_PROJECT_ID" \ -F itemId="$ENV_ITEM_PROJECT_ID" \ -F fieldId="$ENV_SINGLE_SELECT_FIELD_ID" \ -F optionId="$ENV_SINGLE_SELECT_OPTION_ID" \ +======= + gh api graphql -f projectId="$ENV_PROJECT_ID" \ + -f itemId="$ENV_ITEM_PROJECT_ID" \ + -f fieldId="$ENV_SINGLE_SELECT_FIELD_ID" \ + -f optionId="$ENV_SINGLE_SELECT_OPTION_ID" \ +>>>>>>> 861fe12 (Replace all `-F` usage with `-f`) -f query=' mutation($projectId: ID!, $itemId: ID!, $fieldId: ID!, $optionId: String!) { updateProjectV2ItemFieldValue( diff --git a/.github/workflows/project-set-text-date-numeric-field.yaml b/.github/workflows/project-set-text-date-numeric-field.yaml index 0bc48909..20b58887 100644 --- a/.github/workflows/project-set-text-date-numeric-field.yaml +++ b/.github/workflows/project-set-text-date-numeric-field.yaml @@ -65,12 +65,20 @@ jobs: run: | # Set the field based on the inputted desired value if [ "$ENV_FIELD_TYPE" == "date" ] || [ "$ENV_FIELD_TYPE" == "text" ]; then +<<<<<<< HEAD # shellcheck disable=SC2016 gh api graphql -F projectId="$ENV_PROJECT_ID" \ -F itemId="$ENV_ITEM_PROJECT_ID" \ -F fieldId="$ENV_FIELD_ID" \ -F value="$ENV_SET_VALUE" \ -F fieldType="$ENV_FIELD_TYPE" \ +======= + gh api graphql -f projectId="$ENV_PROJECT_ID" \ + -f itemId="$ENV_ITEM_PROJECT_ID" \ + -f fieldId="$ENV_FIELD_ID" \ + -f value="$ENV_SET_VALUE" \ + -f fieldType="$ENV_FIELD_TYPE" \ +>>>>>>> 861fe12 (Replace all `-F` usage with `-f`) -f query=' mutation($projectId: ID!, $itemId: ID!, $fieldId: ID!, $value: String!, $fieldType: String!) { updateProjectV2ItemFieldValue( @@ -88,11 +96,18 @@ jobs: }' elif [ "$ENV_FIELD_TYPE" == "number" ]; then +<<<<<<< HEAD # shellcheck disable=SC2016 gh api graphql -F projectId="$ENV_PROJECT_ID" \ -F itemId="$ENV_ITEM_PROJECT_ID" \ -F fieldId="$ENV_FIELD_ID" \ -F value="$ENV_SET_VALUE" \ +======= + gh api graphql -f projectId="$ENV_PROJECT_ID" \ + -f itemId="$ENV_ITEM_PROJECT_ID" \ + -f fieldId="$ENV_FIELD_ID" \ + -f value="$ENV_SET_VALUE" \ +>>>>>>> 861fe12 (Replace all `-F` usage with `-f`) -f query=' mutation($projectId: ID!, $itemId: ID!, $fieldId: ID!, $value: Float!) { updateProjectV2ItemFieldValue( diff --git a/.github/workflows/project-update-linked-issues.yaml b/.github/workflows/project-update-linked-issues.yaml index 4a8cbdd7..21dd5d8d 100644 --- a/.github/workflows/project-update-linked-issues.yaml +++ b/.github/workflows/project-update-linked-issues.yaml @@ -61,8 +61,12 @@ jobs: ENV_UPDATE_FIELD_VALUE: ${{ inputs.UPDATE_FIELD_VALUE }} run: | # Find the linked issues to the PR +<<<<<<< HEAD # shellcheck disable=SC2016 gh api graphql -F prNodeId="$ENV_PR_NODE_ID" -f query=' +======= + gh api graphql -f prNodeId="$ENV_PR_NODE_ID" -f query=' +>>>>>>> 861fe12 (Replace all `-F` usage with `-f`) query($prNodeId: ID!) { node(id: $prNodeId) { ... on PullRequest { @@ -102,11 +106,18 @@ jobs: case "$ENV_UPDATE_FIELD_TYPE" in "iteration") +<<<<<<< HEAD # shellcheck disable=SC2016 gh api graphql -F projectId="$ENV_PROJECT_ID" \ -F itemId="$issue_id" \ -F fieldId="$ENV_UPDATE_FIELD_ID" \ -F iterationId="$ENV_UPDATE_FIELD_VALUE" \ +======= + gh api graphql -f projectId="$ENV_PROJECT_ID" \ + -f itemId="$issue_id" \ + -f fieldId="$ENV_UPDATE_FIELD_ID" \ + -f iterationId="$ENV_UPDATE_FIELD_VALUE" \ +>>>>>>> 861fe12 (Replace all `-F` usage with `-f`) -f query=' mutation($projectId: ID!, $itemId: ID!, $fieldId: ID!, $iterationId: String!) { updateProjectV2ItemFieldValue( @@ -123,11 +134,18 @@ jobs: ;; "single_select") +<<<<<<< HEAD # shellcheck disable=SC2016 gh api graphql -F projectId="$ENV_PROJECT_ID" \ -F itemId="$issue_id" \ -F fieldId="$ENV_UPDATE_FIELD_ID" \ -F optionId="$ENV_UPDATE_FIELD_VALUE" \ +======= + gh api graphql -f projectId="$ENV_PROJECT_ID" \ + -f itemId="$issue_id" \ + -f fieldId="$ENV_UPDATE_FIELD_ID" \ + -f optionId="$ENV_UPDATE_FIELD_VALUE" \ +>>>>>>> 861fe12 (Replace all `-F` usage with `-f`) -f query=' mutation($projectId: ID!, $itemId: ID!, $fieldId: ID!, $optionId: String!) { updateProjectV2ItemFieldValue( @@ -144,12 +162,20 @@ jobs: ;; "date"|"text") +<<<<<<< HEAD # shellcheck disable=SC2016 gh api graphql -F projectId="$ENV_PROJECT_ID" \ -F itemId="$issue_id" \ -F fieldId="$ENV_UPDATE_FIELD_ID" \ -F value="$ENV_UPDATE_FIELD_VALUE" \ -F fieldType="$ENV_UPDATE_FIELD_TYPE" \ +======= + gh api graphql -f projectId="$ENV_PROJECT_ID" \ + -f itemId="$issue_id" \ + -f fieldId="$ENV_UPDATE_FIELD_ID" \ + -f value="$ENV_UPDATE_FIELD_VALUE" \ + -f fieldType="$ENV_UPDATE_FIELD_TYPE" \ +>>>>>>> 861fe12 (Replace all `-F` usage with `-f`) -f query=' mutation($projectId: ID!, $itemId: ID!, $fieldId: ID!, $value: String!, $fieldType: String!) { updateProjectV2ItemFieldValue( @@ -166,11 +192,18 @@ jobs: ;; "number") +<<<<<<< HEAD # shellcheck disable=SC2016 gh api graphql -F projectId="$ENV_PROJECT_ID" \ -F itemId="$issue_id" \ -F fieldId="$ENV_UPDATE_FIELD_ID" \ -F value="$ENV_UPDATE_FIELD_VALUE" \ +======= + gh api graphql -f projectId="$ENV_PROJECT_ID" \ + -f itemId="$issue_id" \ + -f fieldId="$ENV_UPDATE_FIELD_ID" \ + -f value="$ENV_UPDATE_FIELD_VALUE" \ +>>>>>>> 861fe12 (Replace all `-F` usage with `-f`) -f query=' mutation($projectId: ID!, $itemId: ID!, $fieldId: ID!, $value: Float!) { updateProjectV2ItemFieldValue( From 36b69b4ded8d19d896a0ee6fa3112aa0126d29ab Mon Sep 17 00:00:00 2001 From: Ben Jarmak Date: Wed, 14 May 2025 15:46:17 -0400 Subject: [PATCH 2/7] Conflict resolution --- .github/workflows/project-get-item-id.yaml | 5 --- .../project-update-linked-issues.yaml | 38 ------------------- 2 files changed, 43 deletions(-) diff --git a/.github/workflows/project-get-item-id.yaml b/.github/workflows/project-get-item-id.yaml index 49b287b8..85d3a5af 100644 --- a/.github/workflows/project-get-item-id.yaml +++ b/.github/workflows/project-get-item-id.yaml @@ -50,12 +50,7 @@ jobs: # Query up to 10 projects for the PR # There's no graphQL filter configured to query by a specific project # So we need to query all projects and filter the result ourselves -<<<<<<< HEAD - # shellcheck disable=SC2016 - gh api graphql -F nodeId="$ENV_ITEM_NODE_ID" -f query=' -======= gh api graphql -f nodeId="$ENV_ITEM_NODE_ID" -f query=' ->>>>>>> 861fe12 (Replace all `-F` usage with `-f`) query($nodeId: ID!) { node(id: $nodeId) { ... on PullRequest { diff --git a/.github/workflows/project-update-linked-issues.yaml b/.github/workflows/project-update-linked-issues.yaml index 21dd5d8d..8669ccee 100644 --- a/.github/workflows/project-update-linked-issues.yaml +++ b/.github/workflows/project-update-linked-issues.yaml @@ -61,12 +61,7 @@ jobs: ENV_UPDATE_FIELD_VALUE: ${{ inputs.UPDATE_FIELD_VALUE }} run: | # Find the linked issues to the PR -<<<<<<< HEAD - # shellcheck disable=SC2016 - gh api graphql -F prNodeId="$ENV_PR_NODE_ID" -f query=' -======= gh api graphql -f prNodeId="$ENV_PR_NODE_ID" -f query=' ->>>>>>> 861fe12 (Replace all `-F` usage with `-f`) query($prNodeId: ID!) { node(id: $prNodeId) { ... on PullRequest { @@ -106,18 +101,10 @@ jobs: case "$ENV_UPDATE_FIELD_TYPE" in "iteration") -<<<<<<< HEAD - # shellcheck disable=SC2016 - gh api graphql -F projectId="$ENV_PROJECT_ID" \ - -F itemId="$issue_id" \ - -F fieldId="$ENV_UPDATE_FIELD_ID" \ - -F iterationId="$ENV_UPDATE_FIELD_VALUE" \ -======= gh api graphql -f projectId="$ENV_PROJECT_ID" \ -f itemId="$issue_id" \ -f fieldId="$ENV_UPDATE_FIELD_ID" \ -f iterationId="$ENV_UPDATE_FIELD_VALUE" \ ->>>>>>> 861fe12 (Replace all `-F` usage with `-f`) -f query=' mutation($projectId: ID!, $itemId: ID!, $fieldId: ID!, $iterationId: String!) { updateProjectV2ItemFieldValue( @@ -134,18 +121,10 @@ jobs: ;; "single_select") -<<<<<<< HEAD - # shellcheck disable=SC2016 - gh api graphql -F projectId="$ENV_PROJECT_ID" \ - -F itemId="$issue_id" \ - -F fieldId="$ENV_UPDATE_FIELD_ID" \ - -F optionId="$ENV_UPDATE_FIELD_VALUE" \ -======= gh api graphql -f projectId="$ENV_PROJECT_ID" \ -f itemId="$issue_id" \ -f fieldId="$ENV_UPDATE_FIELD_ID" \ -f optionId="$ENV_UPDATE_FIELD_VALUE" \ ->>>>>>> 861fe12 (Replace all `-F` usage with `-f`) -f query=' mutation($projectId: ID!, $itemId: ID!, $fieldId: ID!, $optionId: String!) { updateProjectV2ItemFieldValue( @@ -162,20 +141,11 @@ jobs: ;; "date"|"text") -<<<<<<< HEAD - # shellcheck disable=SC2016 - gh api graphql -F projectId="$ENV_PROJECT_ID" \ - -F itemId="$issue_id" \ - -F fieldId="$ENV_UPDATE_FIELD_ID" \ - -F value="$ENV_UPDATE_FIELD_VALUE" \ - -F fieldType="$ENV_UPDATE_FIELD_TYPE" \ -======= gh api graphql -f projectId="$ENV_PROJECT_ID" \ -f itemId="$issue_id" \ -f fieldId="$ENV_UPDATE_FIELD_ID" \ -f value="$ENV_UPDATE_FIELD_VALUE" \ -f fieldType="$ENV_UPDATE_FIELD_TYPE" \ ->>>>>>> 861fe12 (Replace all `-F` usage with `-f`) -f query=' mutation($projectId: ID!, $itemId: ID!, $fieldId: ID!, $value: String!, $fieldType: String!) { updateProjectV2ItemFieldValue( @@ -192,18 +162,10 @@ jobs: ;; "number") -<<<<<<< HEAD - # shellcheck disable=SC2016 - gh api graphql -F projectId="$ENV_PROJECT_ID" \ - -F itemId="$issue_id" \ - -F fieldId="$ENV_UPDATE_FIELD_ID" \ - -F value="$ENV_UPDATE_FIELD_VALUE" \ -======= gh api graphql -f projectId="$ENV_PROJECT_ID" \ -f itemId="$issue_id" \ -f fieldId="$ENV_UPDATE_FIELD_ID" \ -f value="$ENV_UPDATE_FIELD_VALUE" \ ->>>>>>> 861fe12 (Replace all `-F` usage with `-f`) -f query=' mutation($projectId: ID!, $itemId: ID!, $fieldId: ID!, $value: Float!) { updateProjectV2ItemFieldValue( From f52ca234398faa1a2a8399aa36150680c2f8487b Mon Sep 17 00:00:00 2001 From: Ben Jarmak Date: Wed, 14 May 2025 15:48:21 -0400 Subject: [PATCH 3/7] More conflict resolution --- .../project-get-set-iteration-field.yaml | 13 ------------ .../project-get-set-single-select-field.yaml | 21 ------------------- .../project-set-text-date-numeric-field.yaml | 17 --------------- 3 files changed, 51 deletions(-) diff --git a/.github/workflows/project-get-set-iteration-field.yaml b/.github/workflows/project-get-set-iteration-field.yaml index cc0ee314..aba6ccb8 100644 --- a/.github/workflows/project-get-set-iteration-field.yaml +++ b/.github/workflows/project-get-set-iteration-field.yaml @@ -69,12 +69,7 @@ jobs: run: | # Get current iteration iteration id # The current iteration is always the first element in the returned list -<<<<<<< HEAD - # shellcheck disable=SC2016 - gh api graphql -F projectId="$ENV_PROJECT_ID" -F fieldName="$ENV_ITERATION_FIELD_NAME" -f query=' -======= gh api graphql -f projectId="$ENV_PROJECT_ID" -f fieldName="$ENV_ITERATION_FIELD_NAME" -f query=' ->>>>>>> 861fe12 (Replace all `-F` usage with `-f`) query($projectId: ID!, $fieldName: String!) { node(id: $projectId) { ... on ProjectV2 { @@ -109,18 +104,10 @@ jobs: ENV_ITERATION_FIELD_ID: ${{ inputs.ITERATION_FIELD_ID }} ENV_ITERATION_OPTION_ID: ${{ steps.get_iteration_option_id.outputs.ITERATION_OPTION_ID }} run: | -<<<<<<< HEAD - # shellcheck disable=SC2016 - gh api graphql -F projectId="$ENV_PROJECT_ID" \ - -F itemId="$ENV_ITEM_PROJECT_ID" \ - -F fieldId="$ENV_ITERATION_FIELD_ID" \ - -F iterationId="$ENV_ITERATION_OPTION_ID" \ -======= gh api graphql -f projectId="$ENV_PROJECT_ID" \ -f itemId="$ENV_ITEM_PROJECT_ID" \ -f fieldId="$ENV_ITERATION_FIELD_ID" \ -f iterationId="$ENV_ITERATION_OPTION_ID" \ ->>>>>>> 861fe12 (Replace all `-F` usage with `-f`) -f query=' mutation($projectId: ID!, $itemId: ID!, $fieldId: ID!, $iterationId: String!) { updateProjectV2ItemFieldValue( diff --git a/.github/workflows/project-get-set-single-select-field.yaml b/.github/workflows/project-get-set-single-select-field.yaml index c66b071f..718e4baa 100644 --- a/.github/workflows/project-get-set-single-select-field.yaml +++ b/.github/workflows/project-get-set-single-select-field.yaml @@ -77,14 +77,8 @@ jobs: # Get single_select option id if [ -z "$ENV_SINGLE_SELECT_OPTION_VALUE" ]; then # No option specified, get first option in list -<<<<<<< HEAD - # shellcheck disable=SC2016 - gh api graphql -F projectId="$ENV_PROJECT_ID" \ - -F fieldName="$ENV_SINGLE_SELECT_FIELD_NAME" \ -======= gh api graphql -f projectId="$ENV_PROJECT_ID" \ -f fieldName="$ENV_SINGLE_SELECT_FIELD_NAME" \ ->>>>>>> 861fe12 (Replace all `-F` usage with `-f`) -f query=' query($projectId: ID!, $fieldName: String!) { node(id: $projectId) { @@ -99,16 +93,9 @@ jobs: }' > single_select_option_data.json else # Get specific value -<<<<<<< HEAD - # shellcheck disable=SC2016 - gh api graphql -F projectId="$ENV_PROJECT_ID" \ - -F fieldName="$ENV_SINGLE_SELECT_FIELD_NAME" \ - -F optionName="$ENV_SINGLE_SELECT_OPTION_VALUE" \ -======= gh api graphql -f projectId="$ENV_PROJECT_ID" \ -f fieldName="$ENV_SINGLE_SELECT_FIELD_NAME" \ -f optionName="$ENV_SINGLE_SELECT_OPTION_VALUE" \ ->>>>>>> 861fe12 (Replace all `-F` usage with `-f`) -f query=' query($projectId: ID!, $fieldName: String!, $optionName: String!) { node(id: $projectId) { @@ -138,18 +125,10 @@ jobs: ENV_SINGLE_SELECT_FIELD_ID: ${{ inputs.SINGLE_SELECT_FIELD_ID }} ENV_SINGLE_SELECT_OPTION_ID: ${{ steps.get_single_select_option_id.outputs.SINGLE_SELECT_OPTION_ID }} run: | -<<<<<<< HEAD - # shellcheck disable=SC2016 - gh api graphql -F projectId="$ENV_PROJECT_ID" \ - -F itemId="$ENV_ITEM_PROJECT_ID" \ - -F fieldId="$ENV_SINGLE_SELECT_FIELD_ID" \ - -F optionId="$ENV_SINGLE_SELECT_OPTION_ID" \ -======= gh api graphql -f projectId="$ENV_PROJECT_ID" \ -f itemId="$ENV_ITEM_PROJECT_ID" \ -f fieldId="$ENV_SINGLE_SELECT_FIELD_ID" \ -f optionId="$ENV_SINGLE_SELECT_OPTION_ID" \ ->>>>>>> 861fe12 (Replace all `-F` usage with `-f`) -f query=' mutation($projectId: ID!, $itemId: ID!, $fieldId: ID!, $optionId: String!) { updateProjectV2ItemFieldValue( diff --git a/.github/workflows/project-set-text-date-numeric-field.yaml b/.github/workflows/project-set-text-date-numeric-field.yaml index 20b58887..9c11c2d8 100644 --- a/.github/workflows/project-set-text-date-numeric-field.yaml +++ b/.github/workflows/project-set-text-date-numeric-field.yaml @@ -65,20 +65,11 @@ jobs: run: | # Set the field based on the inputted desired value if [ "$ENV_FIELD_TYPE" == "date" ] || [ "$ENV_FIELD_TYPE" == "text" ]; then -<<<<<<< HEAD - # shellcheck disable=SC2016 - gh api graphql -F projectId="$ENV_PROJECT_ID" \ - -F itemId="$ENV_ITEM_PROJECT_ID" \ - -F fieldId="$ENV_FIELD_ID" \ - -F value="$ENV_SET_VALUE" \ - -F fieldType="$ENV_FIELD_TYPE" \ -======= gh api graphql -f projectId="$ENV_PROJECT_ID" \ -f itemId="$ENV_ITEM_PROJECT_ID" \ -f fieldId="$ENV_FIELD_ID" \ -f value="$ENV_SET_VALUE" \ -f fieldType="$ENV_FIELD_TYPE" \ ->>>>>>> 861fe12 (Replace all `-F` usage with `-f`) -f query=' mutation($projectId: ID!, $itemId: ID!, $fieldId: ID!, $value: String!, $fieldType: String!) { updateProjectV2ItemFieldValue( @@ -96,18 +87,10 @@ jobs: }' elif [ "$ENV_FIELD_TYPE" == "number" ]; then -<<<<<<< HEAD - # shellcheck disable=SC2016 - gh api graphql -F projectId="$ENV_PROJECT_ID" \ - -F itemId="$ENV_ITEM_PROJECT_ID" \ - -F fieldId="$ENV_FIELD_ID" \ - -F value="$ENV_SET_VALUE" \ -======= gh api graphql -f projectId="$ENV_PROJECT_ID" \ -f itemId="$ENV_ITEM_PROJECT_ID" \ -f fieldId="$ENV_FIELD_ID" \ -f value="$ENV_SET_VALUE" \ ->>>>>>> 861fe12 (Replace all `-F` usage with `-f`) -f query=' mutation($projectId: ID!, $itemId: ID!, $fieldId: ID!, $value: Float!) { updateProjectV2ItemFieldValue( From 51f86807fd309455c6f245d3a73a83c59bda6c8f Mon Sep 17 00:00:00 2001 From: Ben Jarmak Date: Wed, 14 May 2025 15:52:26 -0400 Subject: [PATCH 4/7] Return shellchecks --- .github/workflows/project-get-item-id.yaml | 1 + .github/workflows/project-get-set-iteration-field.yaml | 2 ++ .github/workflows/project-get-set-single-select-field.yaml | 3 +++ .github/workflows/project-set-text-date-numeric-field.yaml | 2 ++ .github/workflows/project-update-linked-issues.yaml | 4 ++++ 5 files changed, 12 insertions(+) diff --git a/.github/workflows/project-get-item-id.yaml b/.github/workflows/project-get-item-id.yaml index 85d3a5af..155a8b07 100644 --- a/.github/workflows/project-get-item-id.yaml +++ b/.github/workflows/project-get-item-id.yaml @@ -50,6 +50,7 @@ jobs: # Query up to 10 projects for the PR # There's no graphQL filter configured to query by a specific project # So we need to query all projects and filter the result ourselves + # shellcheck disable=SC2016 gh api graphql -f nodeId="$ENV_ITEM_NODE_ID" -f query=' query($nodeId: ID!) { node(id: $nodeId) { diff --git a/.github/workflows/project-get-set-iteration-field.yaml b/.github/workflows/project-get-set-iteration-field.yaml index aba6ccb8..4f0ece7f 100644 --- a/.github/workflows/project-get-set-iteration-field.yaml +++ b/.github/workflows/project-get-set-iteration-field.yaml @@ -69,6 +69,7 @@ jobs: run: | # Get current iteration iteration id # The current iteration is always the first element in the returned list + # shellcheck disable=SC2016 gh api graphql -f projectId="$ENV_PROJECT_ID" -f fieldName="$ENV_ITERATION_FIELD_NAME" -f query=' query($projectId: ID!, $fieldName: String!) { node(id: $projectId) { @@ -104,6 +105,7 @@ jobs: ENV_ITERATION_FIELD_ID: ${{ inputs.ITERATION_FIELD_ID }} ENV_ITERATION_OPTION_ID: ${{ steps.get_iteration_option_id.outputs.ITERATION_OPTION_ID }} run: | + # shellcheck disable=SC2016 gh api graphql -f projectId="$ENV_PROJECT_ID" \ -f itemId="$ENV_ITEM_PROJECT_ID" \ -f fieldId="$ENV_ITERATION_FIELD_ID" \ diff --git a/.github/workflows/project-get-set-single-select-field.yaml b/.github/workflows/project-get-set-single-select-field.yaml index 718e4baa..6c3f7188 100644 --- a/.github/workflows/project-get-set-single-select-field.yaml +++ b/.github/workflows/project-get-set-single-select-field.yaml @@ -77,6 +77,7 @@ jobs: # Get single_select option id if [ -z "$ENV_SINGLE_SELECT_OPTION_VALUE" ]; then # No option specified, get first option in list + # shellcheck disable=SC2016 gh api graphql -f projectId="$ENV_PROJECT_ID" \ -f fieldName="$ENV_SINGLE_SELECT_FIELD_NAME" \ -f query=' @@ -93,6 +94,7 @@ jobs: }' > single_select_option_data.json else # Get specific value + # shellcheck disable=SC2016 gh api graphql -f projectId="$ENV_PROJECT_ID" \ -f fieldName="$ENV_SINGLE_SELECT_FIELD_NAME" \ -f optionName="$ENV_SINGLE_SELECT_OPTION_VALUE" \ @@ -125,6 +127,7 @@ jobs: ENV_SINGLE_SELECT_FIELD_ID: ${{ inputs.SINGLE_SELECT_FIELD_ID }} ENV_SINGLE_SELECT_OPTION_ID: ${{ steps.get_single_select_option_id.outputs.SINGLE_SELECT_OPTION_ID }} run: | + # shellcheck disable=SC2016 gh api graphql -f projectId="$ENV_PROJECT_ID" \ -f itemId="$ENV_ITEM_PROJECT_ID" \ -f fieldId="$ENV_SINGLE_SELECT_FIELD_ID" \ diff --git a/.github/workflows/project-set-text-date-numeric-field.yaml b/.github/workflows/project-set-text-date-numeric-field.yaml index 9c11c2d8..f2e486c8 100644 --- a/.github/workflows/project-set-text-date-numeric-field.yaml +++ b/.github/workflows/project-set-text-date-numeric-field.yaml @@ -65,6 +65,7 @@ jobs: run: | # Set the field based on the inputted desired value if [ "$ENV_FIELD_TYPE" == "date" ] || [ "$ENV_FIELD_TYPE" == "text" ]; then + # shellcheck disable=SC2016 gh api graphql -f projectId="$ENV_PROJECT_ID" \ -f itemId="$ENV_ITEM_PROJECT_ID" \ -f fieldId="$ENV_FIELD_ID" \ @@ -87,6 +88,7 @@ jobs: }' elif [ "$ENV_FIELD_TYPE" == "number" ]; then + # shellcheck disable=SC2016 gh api graphql -f projectId="$ENV_PROJECT_ID" \ -f itemId="$ENV_ITEM_PROJECT_ID" \ -f fieldId="$ENV_FIELD_ID" \ diff --git a/.github/workflows/project-update-linked-issues.yaml b/.github/workflows/project-update-linked-issues.yaml index 8669ccee..65fe66d5 100644 --- a/.github/workflows/project-update-linked-issues.yaml +++ b/.github/workflows/project-update-linked-issues.yaml @@ -101,6 +101,7 @@ jobs: case "$ENV_UPDATE_FIELD_TYPE" in "iteration") + # shellcheck disable=SC2016 gh api graphql -f projectId="$ENV_PROJECT_ID" \ -f itemId="$issue_id" \ -f fieldId="$ENV_UPDATE_FIELD_ID" \ @@ -121,6 +122,7 @@ jobs: ;; "single_select") + # shellcheck disable=SC2016 gh api graphql -f projectId="$ENV_PROJECT_ID" \ -f itemId="$issue_id" \ -f fieldId="$ENV_UPDATE_FIELD_ID" \ @@ -141,6 +143,7 @@ jobs: ;; "date"|"text") + # shellcheck disable=SC2016 gh api graphql -f projectId="$ENV_PROJECT_ID" \ -f itemId="$issue_id" \ -f fieldId="$ENV_UPDATE_FIELD_ID" \ @@ -162,6 +165,7 @@ jobs: ;; "number") + # shellcheck disable=SC2016 gh api graphql -f projectId="$ENV_PROJECT_ID" \ -f itemId="$issue_id" \ -f fieldId="$ENV_UPDATE_FIELD_ID" \ From 7fe4e3bfdc590d945166e68dd748d5ff82881088 Mon Sep 17 00:00:00 2001 From: Ben Jarmak Date: Wed, 14 May 2025 15:53:16 -0400 Subject: [PATCH 5/7] one last shellcheck --- .github/workflows/project-update-linked-issues.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/project-update-linked-issues.yaml b/.github/workflows/project-update-linked-issues.yaml index 65fe66d5..3f743c76 100644 --- a/.github/workflows/project-update-linked-issues.yaml +++ b/.github/workflows/project-update-linked-issues.yaml @@ -61,6 +61,7 @@ jobs: ENV_UPDATE_FIELD_VALUE: ${{ inputs.UPDATE_FIELD_VALUE }} run: | # Find the linked issues to the PR + # shellcheck disable=SC2016 gh api graphql -f prNodeId="$ENV_PR_NODE_ID" -f query=' query($prNodeId: ID!) { node(id: $prNodeId) { From 95ff479af0ccc085b0a234292fff7015c00e220d Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Thu, 15 May 2025 09:20:04 -0400 Subject: [PATCH 6/7] fix: disable actionlint (failing on pre-commit.ci) --- .pre-commit-config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9ce49e26..7583c6e4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,10 +9,10 @@ repos: - id: check-added-large-files - id: check-yaml - id: end-of-file-fixer - - repo: https://github.com/rhysd/actionlint - rev: v1.7.7 - hooks: - - id: actionlint-docker + # - repo: https://github.com/rhysd/actionlint + # rev: v1.7.7 + # hooks: + # - id: actionlint-docker - repo: https://github.com/astral-sh/ruff-pre-commit rev: v0.11.9 hooks: From 6b37ffad6b16d8a7f3c0676ba57af6124c30c1bb Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Thu, 15 May 2025 09:23:25 -0400 Subject: [PATCH 7/7] fix: disable actionlint on ci only --- .pre-commit-config.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7583c6e4..e07bc91d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,9 @@ --- # Copyright (c) 2025, NVIDIA CORPORATION. +ci: + skip: [actionlint-docker] + repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v5.0.0 @@ -9,10 +12,10 @@ repos: - id: check-added-large-files - id: check-yaml - id: end-of-file-fixer - # - repo: https://github.com/rhysd/actionlint - # rev: v1.7.7 - # hooks: - # - id: actionlint-docker + - repo: https://github.com/rhysd/actionlint + rev: v1.7.7 + hooks: + - id: actionlint-docker - repo: https://github.com/astral-sh/ruff-pre-commit rev: v0.11.9 hooks: