Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[RPD-244] Add CI to feature branches #145

Merged
merged 1 commit into from
Jun 7, 2023
Merged

[RPD-244] Add CI to feature branches #145

merged 1 commit into from
Jun 7, 2023

Conversation

Christopher-Norman
Copy link
Member

@Christopher-Norman Christopher-Norman commented Jun 7, 2023 •
edited
Loading

Currently, GitHub CI does not run on branches merging into feature branches. This pr fixes this by updating the CI from:

on:
  workflow_call:
  pull_request:
    branches:
      - main
      - develop

  push:
    branches:
      - main
      - develop

to:

on:
  workflow_call:
  pull_request:
    branches:
      - main
      - develop
      - '**feature**'

  push:
    branches:
      - main
      - develop
      - '**feature**'

Which will match any branch that contains the word feature at any position in the branch name. In the future, we may want to specify feature branches in a different way such as feature/RPD-xxx-implement-xyz

Checklist

Please ensure you have done the following:

  • I have read the CONTRIBUTING guide.
  • I have updated the documentation if required.
  • I have added tests which cover my changes.

Type of change

Tick all those that apply:

  • Bug Fix (non-breaking change, fixing an issue)
  • New feature (non-breaking change to add functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Other (add details above)

@Christopher-Norman Christopher-Norman self-assigned this Jun 7, 2023
@Christopher-Norman Christopher-Norman added the enhancement New feature or request label Jun 7, 2023
@Christopher-Norman Christopher-Norman changed the base branch from develop to RPD-118-api-feature June 7, 2023 11:56
@Christopher-Norman Christopher-Norman merged commit c00ae3c into RPD-118-api-feature Jun 7, 2023
@Christopher-Norman Christopher-Norman deleted the RPD-244-add-ci-to-feature-branch branch June 7, 2023 12:03
JonoCX added a commit that referenced this pull request Jul 19, 2023
@Christopher-Norman @JonoCX
@swells2020 @KirsoppJ
[RPD-118] API Feature (#158)
4527a82 
* [RPD-244] Add CI to feature branches (#145)

* [RPD-191] Add an init to core to enable a cleaner import (#143)

* [RPD-195] Add _validation to core (#144)

* Move functions to core _validation

* Move matcha state path to constants

* Move functions to core _validation

* Move matcha state path to constants

* Move region validation to core and update mocks

* Remove unnecessary constants

* [RPD-197] Refactor `get` to return `MatchaState` object (#146)

* RPD-197 introduced state objects and refactored tests

* RPD-197 fixed test_core tests

* RPD-197 fixed tests after changes

* RPD-197 updated based on PR comments

* [RPD-193] Refactor `TemplateRunner.is_approved` into a UI function (#147)

* refactors is_approved

* reformats with pre-commits

* removes test in test_azure_runner

* updates function name

* updates docstring

* updates for function and module names and split tests

* updates test name

* [RPD-194] Create a `provision` function in core (#149)

* Migrate provision functionality to core

* Add stale state removal and add tests for provision API command

* Remove print

* Remove comment

* Add lowercasing prefix to provision function

* Remove cli provision file and redundant comments

* Add print to verbose option

* Add test to check state file is being overwritten

* Update provision help

* [RPD-192] Create a `destroy` function in core (#150)

* moves the remote_state_manager form cli.destroy to destroy_resources

* updates tests

* fixes test error message

* fixes test error

* fixes test error

* removes ui from core

* fixes existing tests

* adds tests

* fixes tests

* updates docstrings

* [RPD-246] Refactor `MatchaStateService` to use `MatchaState` (#151)

* RPD-246 partial refactoring with tests failing

* RPD-246 fixed failing tests for test_core

* RPD-246 fixed tests and add functions to state

* RPD-246 fixing analytics services tests

* RPD-246 fixed analytics service test - added fixture to conf

* RPD-246 tidying up

* RPD-254 tidying up print statements

* RPD-246 updated fetch_resources_from_state_file

* RPD-246 updated typing for mock_state_file

* RPD-246 updated assert_object

* RPD-246 fixed tests

* RPD-246 fixed destroy tests

* RPD-246 stub usage

* [RPD-253] transform user input to lower case on get command (#152)

* lower-caseify user input to core.get(), add tests.

* .

* update tests to align with new base branch

* fixing consequences of poor conflict resolution

* [RPD-196] add api reference documentation to the website (#155)

* functioning API docs

* add to github actions.

* add mkdocstrings to pyproject.toml

* add mkdocstrings to dependencies

* restrict API docs to only core functionality.

* [RPD-256] Add connection string for experiment tracker storage account to state (#156)

* Add MLflow Azure storage connection string

* Update terraform output spacing and description

* [RPD-247] Move the creation of state from `AzureRunner` into `MatchaStateService` (#153)

* Move Matcha state file creation to MatchaStateService

* Update tests to not use local dir

* Add test for building MatchaState object from terraform outputs

* Remove redundant function

* Add typing which was blocked due to circular imports

* Remove print from test_provision.py

* Move creation of matcha.state to MatchaStateService init

* Isolate tests from local directory

* Add test for MatchaStateService intialisation with a MatchaState object

* Move MatchaState mock object to conftest

* Add test for write state and re-use matcha state fixture in core provision tests

* Clean up duplicated fixtures

* Update docstrings

* Fix typo

* Restrict initialisation of MatchaStateService

* Update docstring

* [BUG] [RPD-258] Instantiate MatchStateService after downloading the matcha state from the remote storage (#159)

* Add test describing the bug

* Add code to fix test

* [RPD-255] improve docstrings in core module (#157)

* extend docstrings in provision and get

* extend docstring for destroy

* extend docstring for destroy

* Chris' suggestions

* Jon's comments

* link to privacy information in opt_in and opt_out

* [RPD-254] no state file after destroying resources (#154)

* temporary hotfix for RPD 254. Convenience function to avoid repeating code.

* nit treatment

* [BUG] [RPD-257] Stop removal of contents of "matcha/infrastructure/remote_state_storage" during `matcha provision` (#160)

* adds a fix and associated tests

* adds function to test stale local state

* adds tests

* fixes tests

* fixes tests

* fixes tests

* fixes tests

* updates for comments

* updates tests

* refactor to use MatchaStateService object

* fixes tests

* removes print

* Update spelling to US English

* Update other spelling to US English

* Fix final spelling corrections

* Spelling correction

---------

Co-authored-by: Jonathan Carlton <JonoCX@users.noreply.github.com>
Co-authored-by: Callum Wells <68609181+swells2020@users.noreply.github.com>
Co-authored-by: KirsoppJ <40233184+KirsoppJ@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JonoCX JonoCX JonoCX approved these changes

Assignees

@Christopher-Norman Christopher-Norman

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Christopher-Norman @JonoCX