From 45a61b84990dc0927a7917eb9e92158d3c342883 Mon Sep 17 00:00:00 2001 From: Novak Zaballa Date: Mon, 15 Jan 2024 17:24:45 -0400 Subject: [PATCH 1/9] ci/test-workflows2 --- .github/workflows/test-depends-workflow.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test-depends-workflow.yml b/.github/workflows/test-depends-workflow.yml index bde24f0..7a4be29 100644 --- a/.github/workflows/test-depends-workflow.yml +++ b/.github/workflows/test-depends-workflow.yml @@ -1,19 +1,19 @@ name: Test depends workflow -# on: -# # pull_request: -# # types: [opened, synchronize, reopened, ready_for_review] -# workflow_run: -# workflows: ["Github Labeler"] -# types: -# - completed - on: + # pull_request: + # types: [opened, synchronize, reopened, ready_for_review] workflow_run: - workflows: [Github Labeler] + workflows: ["Github Labeler"] types: - completed +# on: +# workflow_run: +# workflows: [Github Labeler] +# types: +# - completed + jobs: on-success: runs-on: ubuntu-latest From 82fe8b96883ad348f4f949b6d7878851e86fb234 Mon Sep 17 00:00:00 2001 From: Novak Zaballa Date: Mon, 15 Jan 2024 17:30:39 -0400 Subject: [PATCH 2/9] UPdate workflows --- .github/workflows/test-depends-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-depends-workflow.yml b/.github/workflows/test-depends-workflow.yml index 7a4be29..1a0a5e8 100644 --- a/.github/workflows/test-depends-workflow.yml +++ b/.github/workflows/test-depends-workflow.yml @@ -4,7 +4,7 @@ on: # pull_request: # types: [opened, synchronize, reopened, ready_for_review] workflow_run: - workflows: ["Github Labeler"] + workflows: [Github Labeler] types: - completed From 71c88e782215f29747896b076ca54e5fda157193 Mon Sep 17 00:00:00 2001 From: Novak Zaballa Date: Mon, 15 Jan 2024 17:41:39 -0400 Subject: [PATCH 3/9] changes in workflows --- .github/workflows/test-depends-workflow.yml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test-depends-workflow.yml b/.github/workflows/test-depends-workflow.yml index 1a0a5e8..489fc1c 100644 --- a/.github/workflows/test-depends-workflow.yml +++ b/.github/workflows/test-depends-workflow.yml @@ -1,21 +1,15 @@ -name: Test depends workflow +name: Test on: - # pull_request: - # types: [opened, synchronize, reopened, ready_for_review] workflow_run: - workflows: [Github Labeler] + workflows: + - Github Labeler types: - completed -# on: -# workflow_run: -# workflows: [Github Labeler] -# types: -# - completed - jobs: - on-success: + test-job: + name: Test Step runs-on: ubuntu-latest steps: - run: echo 'The triggering workflow passed' \ No newline at end of file From 549deacccd93af8a55ea066f3f14ad8193b97ca9 Mon Sep 17 00:00:00 2001 From: Novak Zaballa Date: Tue, 16 Jan 2024 11:06:46 -0400 Subject: [PATCH 4/9] test Test depends Github Labeler --- .github/workflows/github-labeler.yml | 1 - .github/workflows/test-depends-workflow.yml | 13 ++++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/github-labeler.yml b/.github/workflows/github-labeler.yml index defa3c2..0173c35 100644 --- a/.github/workflows/github-labeler.yml +++ b/.github/workflows/github-labeler.yml @@ -1,5 +1,4 @@ name: Github Labeler - on: pull_request: types: [opened, synchronize, reopened, ready_for_review] diff --git a/.github/workflows/test-depends-workflow.yml b/.github/workflows/test-depends-workflow.yml index 489fc1c..a833320 100644 --- a/.github/workflows/test-depends-workflow.yml +++ b/.github/workflows/test-depends-workflow.yml @@ -1,5 +1,4 @@ -name: Test - +name: Test depends Github Labeler on: workflow_run: workflows: @@ -7,9 +6,17 @@ on: types: - completed +# on: +# workflow_call: +# workflows: +# - Github Labeler +# types: +# - completed + jobs: test-job: name: Test Step runs-on: ubuntu-latest steps: - - run: echo 'The triggering workflow passed' \ No newline at end of file + - name: 'Trigger' + run: echo 'The triggering workflow passed' From fb223b8a23b945dfc969b5f710f72c7ce67935db Mon Sep 17 00:00:00 2001 From: Novak Zaballa Date: Tue, 16 Jan 2024 11:38:44 -0400 Subject: [PATCH 5/9] changes in API Pull Request --- .github/workflows/api-pull-request.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/api-pull-request.yml b/.github/workflows/api-pull-request.yml index c3a43e7..52e5ba3 100644 --- a/.github/workflows/api-pull-request.yml +++ b/.github/workflows/api-pull-request.yml @@ -2,7 +2,8 @@ name: API Pull Request on: workflow_run: - workflows: ['Github Labeler'] + workflows: + - Github Labeler types: - completed @@ -13,7 +14,7 @@ on: jobs: test: if: ${{ github.event_name == 'push' || contains( github.event.pull_request.labels.*.name, 'github') || contains( github.event.pull_request.labels.*.name, 'api') }} - runs-on: General-Purpose-8c-Runner + runs-on: ubuntu-latest name: API Unit Tests # services: @@ -38,6 +39,9 @@ jobs: - name: Install requirements run: pip install -r requirements.txt + - name: Run Tests + run: pytest + # - uses: actions/setup-python@v4 # with: # python-version: ${{ matrix.python-version }} @@ -72,8 +76,6 @@ jobs: # key: testmon-data-python${{ matrix.python-version }}-${{ github.event.pull_request.base.sha }} # restore-keys: testmon-data-python${{ matrix.python-version }}- - - name: Run Tests - run: pytest # - name: Save testmon data cache # id: cache-testmon-save From 0e0d7ad4562328100c139ea5188f7b8171e7c904 Mon Sep 17 00:00:00 2001 From: Novak Zaballa Date: Tue, 16 Jan 2024 11:39:55 -0400 Subject: [PATCH 6/9] changes in API Pull Request --- .github/workflows/api-pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/api-pull-request.yml b/.github/workflows/api-pull-request.yml index 52e5ba3..9dfcc5e 100644 --- a/.github/workflows/api-pull-request.yml +++ b/.github/workflows/api-pull-request.yml @@ -13,7 +13,7 @@ on: jobs: test: - if: ${{ github.event_name == 'push' || contains( github.event.pull_request.labels.*.name, 'github') || contains( github.event.pull_request.labels.*.name, 'api') }} + # if: ${{ github.event_name == 'push' || contains( github.event.pull_request.labels.*.name, 'github') || contains( github.event.pull_request.labels.*.name, 'api') }} runs-on: ubuntu-latest name: API Unit Tests From 10141c3a22c0d025128554eb9a1488250c1cd39f Mon Sep 17 00:00:00 2001 From: Novak Zaballa Date: Tue, 16 Jan 2024 11:40:58 -0400 Subject: [PATCH 7/9] changes in API Pull Request 3 --- .github/workflows/api-pull-request.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/api-pull-request.yml b/.github/workflows/api-pull-request.yml index 9dfcc5e..4a082f2 100644 --- a/.github/workflows/api-pull-request.yml +++ b/.github/workflows/api-pull-request.yml @@ -1,5 +1,4 @@ name: API Pull Request - on: workflow_run: workflows: From 767938643610aa3ecc8ff7826b309d1a977fbe1a Mon Sep 17 00:00:00 2001 From: Novak Zaballa Date: Tue, 16 Jan 2024 11:45:12 -0400 Subject: [PATCH 8/9] changes in API Pull Request 4 --- .github/workflows/api-pull-request.yml | 34 ++++++++++++++------------ 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/.github/workflows/api-pull-request.yml b/.github/workflows/api-pull-request.yml index 4a082f2..fa85715 100644 --- a/.github/workflows/api-pull-request.yml +++ b/.github/workflows/api-pull-request.yml @@ -1,9 +1,9 @@ name: API Pull Request on: workflow_run: - workflows: + workflows: - Github Labeler - types: + types: - completed # defaults: @@ -11,10 +11,24 @@ on: # working-directory: test jobs: - test: - # if: ${{ github.event_name == 'push' || contains( github.event.pull_request.labels.*.name, 'github') || contains( github.event.pull_request.labels.*.name, 'api') }} - runs-on: ubuntu-latest + test-job: name: API Unit Tests + runs-on: ubuntu-latest + steps: + - name: Install requirements + run: pip install -r requirements.txt + - name: Run Tests + run: pytest + +# jobs: +# test-job: +# name: Test Step +# runs-on: ubuntu-latest +# steps: +# - name: 'Trigger' +# run: echo 'The triggering workflow passed' + + # if: ${{ github.event_name == 'push' || contains( github.event.pull_request.labels.*.name, 'github') || contains( github.event.pull_request.labels.*.name, 'api') }} # services: # postgres: @@ -31,16 +45,6 @@ jobs: # matrix: # python-version: ['3.10', '3.11'] - steps: - - name: Cloning repo - uses: actions/checkout@v3 - - - name: Install requirements - run: pip install -r requirements.txt - - - name: Run Tests - run: pytest - # - uses: actions/setup-python@v4 # with: # python-version: ${{ matrix.python-version }} From b16bc8d2aea3885023f4c82a69f2cc929eba5bb3 Mon Sep 17 00:00:00 2001 From: Novak Zaballa Date: Tue, 16 Jan 2024 11:47:00 -0400 Subject: [PATCH 9/9] changes in API Pull Request 5 --- .github/workflows/api-pull-request.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/api-pull-request.yml b/.github/workflows/api-pull-request.yml index fa85715..113859f 100644 --- a/.github/workflows/api-pull-request.yml +++ b/.github/workflows/api-pull-request.yml @@ -1,14 +1,11 @@ -name: API Pull Request +name: API Pull Request Github Labeler on: workflow_run: workflows: - - Github Labeler + - Test depends Github Labeler types: - completed -# defaults: -# run: -# working-directory: test jobs: test-job: @@ -19,7 +16,11 @@ jobs: run: pip install -r requirements.txt - name: Run Tests run: pytest - + +# defaults: +# run: +# working-directory: test + # jobs: # test-job: # name: Test Step