Skip to content

Commit

Permalink
Merge branch 'feat/refactor-ci-tests' into test/refactor-ci-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
netbe authored Sep 10, 2024
2 parents 7668459 + 49914b7 commit 66deb30
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/_reusable_run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:
type: boolean
default: false
required: false
branch:
type: string
required: true
secrets:
ZENKINS_USERNAME:
required: true
Expand All @@ -26,7 +29,9 @@ jobs:
SLACK_WEBHOOK_URL: ${{ secrets.WIRE_IOS_CI_WEBHOOK }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ inputs.branch }}

- name: Retrieve Xcode version
run: |
Expand Down Expand Up @@ -80,7 +85,7 @@ jobs:
# Scripts
- name: Test Scripts
if: ${{ contains(inputs.folders, "scripts") || inputs.all }}
if: ${{ contains(inputs.folders, 'scripts') || inputs.all }}
run: |
echo "Scripts has changes"
echo "Testing Scripts..."
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ name: Test Develop

on:
workflow_dispatch:
push:
branches:
- 'develop'

schedule:
- cron: "0 21 * * *"

# This is what will cancel the workflow
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -16,4 +15,5 @@ jobs:
uses: ./.github/workflows/_reusable_run_tests.yml
with:
all: true
branch: develop
secrets: inherit
1 change: 1 addition & 0 deletions .github/workflows/test_pr_changes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,5 @@ jobs:
uses: ./.github/workflows/_reusable_run_tests.yml
with:
folders: ${{ join(fromJson(needs.detect-changes.outputs.folders), ',') }}
branch: ${{ github.head_ref }}
secrets: inherit

0 comments on commit 66deb30

Please sign in to comment.