Skip to content

Commit

Permalink
Merge pull request #35 from DNAstack/develop
Browse files Browse the repository at this point in the history
v1.0.0
  • Loading branch information
hkeward authored Nov 21, 2023
2 parents 5a23c6e + 6c6ed7c commit b27f911
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ If any step of the action fails, the check will fail; however if some task tests
# GitHub action usage

```yaml
- uses: dnastack/wdl-ci@v0.2.0
- uses: dnastack/wdl-ci@v1.0.0
with:
# Configuration file where tests can be found
# Default: wdl-ci.config.json
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
with:
submodules: true
- name: wdl-ci
uses: dnastack/wdl-ci@v0.2.0
uses: dnastack/wdl-ci@v1.0.0
with:
wallet-url: ${{ secrets.WALLET_URL }}
wallet-client-id: ${{ secrets.WALLET_CLIENT_ID }}
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
repository: ${{ github.event.pull_request.head.repo.full_name }}
ref: ${{ github.event.pull_request.head.ref }}
- name: wdl-ci
uses: dnastack/wdl-ci@v0.2.0
uses: dnastack/wdl-ci@v1.0.0
with:
wallet-url: ${{ secrets.WALLET_URL }}
wallet-client-id: ${{ secrets.WALLET_CLIENT_ID }}
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
repository: ${{ github.event.pull_request.head.repo.full_name }}
ref: ${{ github.event.pull_request.head.ref }}
- name: wdl-ci
uses: dnastack/wdl-ci@v0.2.0
uses: dnastack/wdl-ci@v1.0.0
with:
wallet-url: ${{ secrets.WALLET_URL }}
wallet-client-id: ${{ secrets.WALLET_CLIENT_ID }}
Expand Down
10 changes: 5 additions & 5 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,19 @@ runs:
echo "WDL_CI_CUSTOM_TEST_WDL_DIR"=${{ inputs.wdl_ci_custom_test_wdl_dir }} >> $GITHUB_ENV
fi
- name: lint
uses: docker://dnastack/wdl-ci:v0.2.0
uses: docker://dnastack/wdl-ci:v1.0.0
with:
args: lint
- name: detect-changes
uses: docker://dnastack/wdl-ci:v0.2.0
uses: docker://dnastack/wdl-ci:v1.0.0
with:
args: detect-changes
- name: submit
uses: docker://dnastack/wdl-ci:v0.2.0
uses: docker://dnastack/wdl-ci:v1.0.0
with:
args: submit
- name: monitor
uses: docker://dnastack/wdl-ci:v0.2.0
uses: docker://dnastack/wdl-ci:v1.0.0
with:
args: monitor --update-digests
# If a test fails, still update task digests for any tests that succeeded
Expand All @@ -76,6 +76,6 @@ runs:
default_author: github_actions
- name: cleanup
if: always()
uses: docker://dnastack/wdl-ci:v0.2.0
uses: docker://dnastack/wdl-ci:v1.0.0
with:
args: cleanup
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[project]
name = "wdl-testing-cli"
description = "DNAstack WDL testing CLI"
version = "v0.2.0"
version = "1.0.0"
authors = [
{ name = "DNAstack", email = "[email protected]" }
]
Expand Down
4 changes: 2 additions & 2 deletions src/wdlci/auth/refresh_token_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import datetime
import requests
from wdlci.config import Config
from wdlci.exception.wdl_test_cli_exit_exception import WdlTestCliException
from wdlci.exception.wdl_test_cli_exit_exception import WdlTestCliExitException


class RefreshTokenAuth(object):
Expand Down Expand Up @@ -46,7 +46,7 @@ def __obtain_access_token(self):

response = requests.post(url, params=params, headers=headers)
if response.status_code != 200:
raise WdlTestCliException(
raise WdlTestCliExitException(
"could not obtain access token from refresh token", 1
)

Expand Down
2 changes: 1 addition & 1 deletion src/wdlci/workbench/ewes_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def submit_workflow_run(self, workflow_run):
}

form_data = {
"workflow_url": f"{env.workbench_workflow_service_url}/{env.workbench_namespace}/workflows/{workflow_run._workflow_id}/versions/v1_0_0/descriptor",
"workflow_url": workflow_run._workflow_id,
"workflow_type": "WDL",
"workflow_type_version": "1.0",
"workflow_params": {**workflow_run._inputs, **output_test_task_params},
Expand Down

0 comments on commit b27f911

Please sign in to comment.