From 26e52424ba32df860178b1be14da2c141b692bd7 Mon Sep 17 00:00:00 2001 From: wileyj <2847772+wileyj@users.noreply.github.com> Date: Mon, 11 Mar 2024 13:03:33 -0700 Subject: [PATCH 01/11] yaml test 2 --- test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/test.yml b/test.yml index 27984e0e5f..7d5e3a803f 100644 --- a/test.yml +++ b/test.yml @@ -16,3 +16,4 @@ lines: - line 15 - line 15 - line 15 + - line 16 From 02b09b99863ea84a83f416e1f575e32c4e3e6622 Mon Sep 17 00:00:00 2001 From: wileyj <2847772+wileyj@users.noreply.github.com> Date: Mon, 11 Mar 2024 13:07:48 -0700 Subject: [PATCH 02/11] cond 1 --- .github/workflows/ci.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7d955200cc..8738a41734 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -116,19 +116,20 @@ jobs: ## - PR review comment ## - PR change is requested rustfmt: - if: | - ( - needs.pre.outputs.should_skip != 'true' || - !fromJSON(needs.pre.outputs.paths_result).rustfmt.should_skip - ) || - !( - github.event_name == 'pull_request_review' && - github.event.action == 'submitted' && - ( - github.event.review.state == 'commented' || - github.event.review.state == 'changes_requested' - ) - ) + if: needs.pre.outputs.should_skip != 'true' || !fromJSON(needs.pre.outputs.paths_result).rustfmt.should_skip + # if: | + # ( + # needs.pre.outputs.should_skip != 'true' || + # !fromJSON(needs.pre.outputs.paths_result).rustfmt.should_skip + # ) || + # !( + # github.event_name == 'pull_request_review' && + # github.event.action == 'submitted' && + # ( + # github.event.review.state == 'commented' || + # github.event.review.state == 'changes_requested' + # ) + # ) name: Rust Format needs: pre runs-on: ubuntu-latest From 7884a681ea3fb94b921414fc908ef4f7bc23867d Mon Sep 17 00:00:00 2001 From: wileyj <2847772+wileyj@users.noreply.github.com> Date: Mon, 11 Mar 2024 13:19:24 -0700 Subject: [PATCH 03/11] trigger test --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8738a41734..97d3326d7e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,14 +68,14 @@ concurrency: run-name: ${{ inputs.tag }} jobs: - pre: + pre_job: name: Workflow Check # continue-on-error: true # Uncomment once integration is finished runs-on: ubuntu-latest # Map a step output to a job output outputs: - should_skip: ${{ steps.skip_check.outputs.should_skip }} - paths_result: ${{ steps.skip_check.outputs.paths_result }} + should_skip: ${{ steps.workflow_check.outputs.should_skip }} + paths_result: ${{ steps.workflow_check.outputs.paths_result }} steps: - name: skip-duplicate-actions id: workflow_check @@ -98,7 +98,7 @@ jobs: - '.cargo/**' - 'contrib/core-contract-tests/**' - 'net-test/**' - - '.github/workflows/**' + # - '.github/workflows/**' - '.github/actions/**' - '**.sh' ## for testing paths_ignore: @@ -116,7 +116,7 @@ jobs: ## - PR review comment ## - PR change is requested rustfmt: - if: needs.pre.outputs.should_skip != 'true' || !fromJSON(needs.pre.outputs.paths_result).rustfmt.should_skip + if: needs.pre_job.outputs.should_skip != 'true' || !fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip # if: | # ( # needs.pre.outputs.should_skip != 'true' || @@ -131,7 +131,7 @@ jobs: # ) # ) name: Rust Format - needs: pre + needs: pre_job runs-on: ubuntu-latest steps: - name: Echo From 84640c6170bcd7cfb8577469c747ae905de8f1f3 Mon Sep 17 00:00:00 2001 From: wileyj <2847772+wileyj@users.noreply.github.com> Date: Mon, 11 Mar 2024 13:22:49 -0700 Subject: [PATCH 04/11] trigger test --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 97d3326d7e..016e1af9bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -116,7 +116,7 @@ jobs: ## - PR review comment ## - PR change is requested rustfmt: - if: needs.pre_job.outputs.should_skip != 'true' || !fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip + if: needs.pre_job.outputs.should_skip != 'true' || fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip != 'true' # if: | # ( # needs.pre.outputs.should_skip != 'true' || From 733af9c016389d695e8353f119a1f19d112b0692 Mon Sep 17 00:00:00 2001 From: wileyj <2847772+wileyj@users.noreply.github.com> Date: Mon, 11 Mar 2024 13:24:52 -0700 Subject: [PATCH 05/11] trigger test --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 016e1af9bd..3d7b034e30 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -116,7 +116,8 @@ jobs: ## - PR review comment ## - PR change is requested rustfmt: - if: needs.pre_job.outputs.should_skip != 'true' || fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip != 'true' + if: needs.pre_job.outputs.should_skip == 'true' || fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip == 'true' + # if: needs.pre_job.outputs.should_skip != 'true' || fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip != 'true' # if: | # ( # needs.pre.outputs.should_skip != 'true' || From ad3dc824b4f792db0478a7d0e468bdd9812219f3 Mon Sep 17 00:00:00 2001 From: wileyj <2847772+wileyj@users.noreply.github.com> Date: Mon, 11 Mar 2024 14:10:26 -0700 Subject: [PATCH 06/11] trigger test --- .github/workflows/ci.yml | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d7b034e30..07cca22b6d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -116,21 +116,20 @@ jobs: ## - PR review comment ## - PR change is requested rustfmt: - if: needs.pre_job.outputs.should_skip == 'true' || fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip == 'true' - # if: needs.pre_job.outputs.should_skip != 'true' || fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip != 'true' - # if: | - # ( - # needs.pre.outputs.should_skip != 'true' || - # !fromJSON(needs.pre.outputs.paths_result).rustfmt.should_skip - # ) || - # !( - # github.event_name == 'pull_request_review' && - # github.event.action == 'submitted' && - # ( - # github.event.review.state == 'commented' || - # github.event.review.state == 'changes_requested' - # ) - # ) + # if: needs.pre_job.outputs.should_skip == 'true' || fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip == 'true' + if: | + ( + needs.pre.outputs.should_skip == 'true' || + fromJSON(needs.pre.outputs.paths_result).rustfmt.should_skip + ) || + !( + github.event_name == 'pull_request_review' && + github.event.action == 'submitted' && + ( + github.event.review.state == 'commented' || + github.event.review.state == 'changes_requested' + ) + ) name: Rust Format needs: pre_job runs-on: ubuntu-latest From 0f859af717d9936e12fd7880f682b3628267ab98 Mon Sep 17 00:00:00 2001 From: wileyj <2847772+wileyj@users.noreply.github.com> Date: Mon, 11 Mar 2024 14:12:06 -0700 Subject: [PATCH 07/11] trigger test --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 07cca22b6d..74f454eb96 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -120,8 +120,8 @@ jobs: if: | ( needs.pre.outputs.should_skip == 'true' || - fromJSON(needs.pre.outputs.paths_result).rustfmt.should_skip - ) || + fromJSON(needs.pre.outputs.paths_result).rustfmt.should_skip == 'true' + ) && !( github.event_name == 'pull_request_review' && github.event.action == 'submitted' && From 8c5ffaf11a89492830f5cc2c4e7dfb2e8a792ee6 Mon Sep 17 00:00:00 2001 From: wileyj <2847772+wileyj@users.noreply.github.com> Date: Mon, 11 Mar 2024 14:12:54 -0700 Subject: [PATCH 08/11] trigger test --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 74f454eb96..e39736aff8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -119,9 +119,9 @@ jobs: # if: needs.pre_job.outputs.should_skip == 'true' || fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip == 'true' if: | ( - needs.pre.outputs.should_skip == 'true' || - fromJSON(needs.pre.outputs.paths_result).rustfmt.should_skip == 'true' - ) && + needs.pre_job.outputs.should_skip == 'true' || + fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip + ) || !( github.event_name == 'pull_request_review' && github.event.action == 'submitted' && From 753ba78b0e2b5cec7b7167bec0dab030292b72bf Mon Sep 17 00:00:00 2001 From: wileyj <2847772+wileyj@users.noreply.github.com> Date: Mon, 11 Mar 2024 14:20:29 -0700 Subject: [PATCH 09/11] trigger test --- .github/workflows/ci.yml | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e39736aff8..eecba57698 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,7 +98,6 @@ jobs: - '.cargo/**' - 'contrib/core-contract-tests/**' - 'net-test/**' - # - '.github/workflows/**' - '.github/actions/**' - '**.sh' ## for testing paths_ignore: @@ -107,6 +106,7 @@ jobs: - '**.txt' - '**.toml' - '**.in' +# - '.github/workflows/**' ## ## Jobs to execute everytime workflow runs @@ -116,20 +116,25 @@ jobs: ## - PR review comment ## - PR change is requested rustfmt: + if: needs.pre_job.outputs.should_skip != 'true' || fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip != 'true' # if: needs.pre_job.outputs.should_skip == 'true' || fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip == 'true' - if: | - ( - needs.pre_job.outputs.should_skip == 'true' || - fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip - ) || - !( - github.event_name == 'pull_request_review' && - github.event.action == 'submitted' && - ( - github.event.review.state == 'commented' || - github.event.review.state == 'changes_requested' - ) - ) + # if: | + # ( + # needs.pre_job.outputs.should_skip != 'true' || + # fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip + # ) + # ( + # needs.pre_job.outputs.should_skip == 'true' || + # fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip + # ) || + # !( + # github.event_name == 'pull_request_review' && + # github.event.action == 'submitted' && + # ( + # github.event.review.state == 'commented' || + # github.event.review.state == 'changes_requested' + # ) + # ) name: Rust Format needs: pre_job runs-on: ubuntu-latest @@ -140,9 +145,10 @@ jobs: echo "ci test" echo "github.event_name: ${{ github.event_name }}" echo "github.event.action: ${{ github.event.action }}" - echo "github.event: ${{ github.event }}" - echo "needs.pre.outputs.should_skip: ${{ needs.pre_job.outputs.should_skip }}" - echo "needs.pre.outputs.paths_result: ${{ needs.pre_job.outputs.paths_result }}" + echo "github.event.review.state: ${{ github.event.review.state }}" + echo "GLOBAL: needs.pre.outputs.should_skip: ${{ needs.pre_job.outputs.should_skip }}" + echo "PATHS_FILTER: needs.pre.outputs.paths_result: ${{ needs.pre_job.outputs.paths_result }}" + echo "PATHS_FILTER: fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip: ${{ fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip }} ################################################################# ## double commented below From bb00b5e296354191831197a5a6be940d27bb9ad0 Mon Sep 17 00:00:00 2001 From: wileyj <2847772+wileyj@users.noreply.github.com> Date: Mon, 11 Mar 2024 14:22:14 -0700 Subject: [PATCH 10/11] trigger test --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eecba57698..0e56fddd14 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -148,7 +148,7 @@ jobs: echo "github.event.review.state: ${{ github.event.review.state }}" echo "GLOBAL: needs.pre.outputs.should_skip: ${{ needs.pre_job.outputs.should_skip }}" echo "PATHS_FILTER: needs.pre.outputs.paths_result: ${{ needs.pre_job.outputs.paths_result }}" - echo "PATHS_FILTER: fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip: ${{ fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip }} + echo "PATHS_FILTER: fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip: ${{ fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip }}" ################################################################# ## double commented below From c2e95fa427ccdab1b06f9569ac0890a8ba8b6a99 Mon Sep 17 00:00:00 2001 From: wileyj <2847772+wileyj@users.noreply.github.com> Date: Wed, 20 Mar 2024 15:08:02 -0700 Subject: [PATCH 11/11] update --- .github/workflows/ci.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0e56fddd14..9b176c492d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -116,7 +116,11 @@ jobs: ## - PR review comment ## - PR change is requested rustfmt: - if: needs.pre_job.outputs.should_skip != 'true' || fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip != 'true' + if: | + !( + needs.pre_job.outputs.should_skip == 'true' || + fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip == 'true' + ) # if: needs.pre_job.outputs.should_skip == 'true' || fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip == 'true' # if: | # ( @@ -147,8 +151,8 @@ jobs: echo "github.event.action: ${{ github.event.action }}" echo "github.event.review.state: ${{ github.event.review.state }}" echo "GLOBAL: needs.pre.outputs.should_skip: ${{ needs.pre_job.outputs.should_skip }}" - echo "PATHS_FILTER: needs.pre.outputs.paths_result: ${{ needs.pre_job.outputs.paths_result }}" - echo "PATHS_FILTER: fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip: ${{ fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip }}" + echo "PATHS_RESULT: needs.pre.outputs.paths_result: ${{ needs.pre_job.outputs.paths_result }}" + echo "PATHS_RESULT: fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip: ${{ fromJSON(needs.pre_job.outputs.paths_result).rustfmt.should_skip }}" ################################################################# ## double commented below