Skip to content

Commit

Permalink
update ci
Browse files Browse the repository at this point in the history
update refs

Fix platform tests
  • Loading branch information
sambles committed Jul 17, 2023
1 parent 4bbaca6 commit be0fd2a
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:

- name: Setup Changelog builder
run: |
BRANCH='develop'
BRANCH='main'
BASE_URL="https://raw.githubusercontent.com/OasisLMF/OasisPlatform/$BRANCH/scripts"
pip install -r $BASE_URL/requirments-changelog.txt
wget $BASE_URL/update-changelog.py
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-oasislmf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
required: false

env:
oasislmf_branch: ${{ github.event_name != 'workflow_dispatch' && 'backports/1.28.x' || inputs.oasislmf_branch }}
oasislmf_branch: ${{ github.event_name != 'workflow_dispatch' && 'stable/1.28.x' || inputs.oasislmf_branch }}

jobs:
build_ods:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ on:

jobs:
platform_testing:
uses: OasisLMF/OasisPlatform/.github/workflows/test-python.yml@develop
uses: OasisLMF/OasisPlatform/.github/workflows/test-python.yml@main
secrets: inherit
with:
ods_branch: ${{ github.ref }}
platform_branch: ${{ github.event_name != 'workflow_dispatch' && 'develop' || inputs.platform_branch }}
platform_branch: ${{ github.event_name != 'workflow_dispatch' && 'main-platform1' || inputs.platform_branch }}
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Commit and push the changes once you are happy with them.

When you're finished with the changes, create a pull request, also known as a PR.
- Fill the PR template in all its parts.
- As a general rule, the **develop** branch is the target of all PRs for new features or bugfixes.
- As a general rule, the **main** branch is the target of all PRs for new features or bugfixes.
- Add the "Ready for Review" label to this PR.
- Don't forget to [link PR to issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) if you are solving one.
- Enable the checkbox to [allow maintainer edits](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork) so the branch can be updated for a merge.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ config = {
}
}
},
'ri_scope': 'https://raw.githubusercontent.com/OasisLMF/OasisPiWind/master/tests/inputs/SourceReinsScopeOEDPiWind.csv', # url
'ri_scope': 'https://raw.githubusercontent.com/OasisLMF/OasisPiWind/main/tests/inputs/SourceReinsScopeOEDPiWind.csv', # url
}
```

Expand Down
2 changes: 1 addition & 1 deletion tests/test_ods_package.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

base_test_path = pathlib.Path(__file__).parent

piwind_branch = 'develop'
piwind_branch = 'main'
base_url = f'https://raw.githubusercontent.com/OasisLMF/OasisPiWind/{piwind_branch}/tests/inputs'
input_file_names = {
"csv": {
Expand Down

0 comments on commit be0fd2a

Please sign in to comment.