Skip to content

Commit

Permalink
simplify integ test defaults
Browse files Browse the repository at this point in the history
- In workflow_dispatch mode, fill in the repo and email for us. We still
  want this to be required in workflow_call (to prevent unknowingly
  testing against the wrong test apps).
- rm klotho-repo, which we don't need. If another repo invokes this
  workflow, it'll just compile its own klotho (that is, checkout will
  check out that other repo, not klothoplatform/klotho -- which is just
  what we want).
  • Loading branch information
Yuval Shavit authored and Yuval Shavit committed Jan 9, 2023
1 parent b3f0efe commit c5fec37
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nightly-integ-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
# This corresponds to 2-3am us/eastern (depending on daylight savings), or 11pm - midnight pacific
- cron: '0 7 * * 1-5'
workflow_dispatch: null
name: integration tests
name: nightly integration tests
concurrency: integ-tests
jobs:
javascript:
Expand Down
14 changes: 3 additions & 11 deletions .github/workflows/run-integ-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,26 @@ on:
description: The repo of the app to test, in Organization/Repo format
required: true
type: string
default: klothoplatform/sample-apps
test-app-ref:
description: Git SHA or branch name of test-app-repo
required: false
type: string
default: main
test-app-overrides:
description: comma-delimited list of dirs within test-app-repo
description: comma-delimited list of dirs within test-app-repo to run (if empty, runs all)
required: false
type: string
klotho-login:
description: email address to log into Klotho
required: true
type: string
default: [email protected]
region:
description: the AWS region to deploy to
required: false
type: string
default: us-east-1
klotho-repo:
description: org/repo of the Klotho source
required: false
type: string
workflow_call:
# same inputs as workflow_dispatch
inputs:
Expand All @@ -52,10 +50,6 @@ on:
required: false
type: string
default: us-east-1
klotho-repo:
description: org/repo of the Klotho source
required: false
type: string
env:
INTEG_TEST_ATTEMPTS: 3 # how many times we'll try to run "npm run integ-test" before we mark it as failed. See klothoplatform/sample-apps#44
name: run integration tests
Expand Down Expand Up @@ -99,8 +93,6 @@ jobs:
steps:
- name: checkout klotho
uses: actions/checkout@v3
with:
repository: ${{ inputs.klotho-repo }}
- uses: actions/setup-go@v3
with:
go-version: 1.18.x
Expand Down

0 comments on commit c5fec37

Please sign in to comment.