Skip to content
This repository has been archived by the owner on Oct 25, 2024. It is now read-only.

ci: streamline develop <> master merges #1166

Merged
merged 6 commits into from
Aug 1, 2023

Conversation

ra0x3
Copy link
Contributor

@ra0x3 ra0x3 commented Aug 1, 2023

Thanks for opening a PR with the Fuel Indexer project, please review the Checklist below and ensure you've completed all of the necessary steps to make this PR review as painless as possible.

Checklist

  • Ensure your top-leve commit message is inline with our contributor guidelines.
  • Please add proper labels.
  • If there is an issue associated with this PR, please link the issue (right-hand sidebar)
  • If there is not an issue associated with this PR, add this PR to the "Fuel Indexer" project (right-hand sidebar)
  • Please allow Codeowners at least 24 hours to do a first-pass review.
  • Please add thorougly detailed testing steps below.
  • Please keep your Changelog message short and sweet.

Description

  • Updates CI to only do cargo check when merging master <- develop and develop <- master
  • I will test this out before cutting a release

Testing steps

  • N/A

Changelog

  • ci: streamline develop <> master merges

@ra0x3 ra0x3 added the ci label Aug 1, 2023
@ra0x3 ra0x3 self-assigned this Aug 1, 2023
@ra0x3 ra0x3 requested a review from deekerno as a code owner August 1, 2023 13:30
@ra0x3 ra0x3 linked an issue Aug 1, 2023 that may be closed by this pull request
@ra0x3 ra0x3 force-pushed the rashad/1162-streamline-dev-master-merge branch 5 times, most recently from 5c48dde to c713975 Compare August 1, 2023 13:49
if [[ ${{ env.BRANCH_NAME }} =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
echo "is_semver_branch=true" >> $GITHUB_OUTPUT
echo "This is a release branch ^(^.^)^"
else
echo "Not a release branch ^(^.^)^"
fi

echo "IS_MASTER=${{ env.IS_MASTER }}"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gonna use this for debugging

@ra0x3 ra0x3 requested a review from lostman August 1, 2023 14:56
@ra0x3 ra0x3 force-pushed the rashad/1162-streamline-dev-master-merge branch from 545b9aa to 47211a1 Compare August 1, 2023 18:27
Copy link
Contributor

@deekerno deekerno left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IS_YOU_OR_ME_OR_WE_OR_SHE_OR_HE_OR_THEY...

@ra0x3 ra0x3 merged commit 1f666d4 into develop Aug 1, 2023
45 checks passed
@ra0x3 ra0x3 deleted the rashad/1162-streamline-dev-master-merge branch August 1, 2023 18:38
ra0x3 added a commit that referenced this pull request Aug 1, 2023
ra0x3 added a commit that referenced this pull request Aug 2, 2023
* fix: add sql endpoint auth + make `run_query` fail gracefully (#1136)

* fix: add sql endpoint auth

* retrigger ci?

---------

Co-authored-by: Rashad Alston <[email protected]>

* chore: switch to manual sqlx query logging (#1138)

* chore: switch to manual sqlx query logging

* fix test

* uat

* add rustdoc

---------

Co-authored-by: Rashad Alston <[email protected]>

* fix: update readme (#1141)

* enhancement: make `NODE_BLOCK_PAGE_SIZE` configurable (#1147)

* Replace blocking `reqwest` usage with async (#1148)

* Revert "Replace blocking `reqwest` usage with async" (#1151)

Revert "Replace blocking `reqwest` usage with async (#1148)"

This reverts commit 19dbf2a.

* docs: adjust docs to include `--block-page-size` on start commands (#1153)

Adjust docs for start commands

* Replace blocking `reqwest` usage with async (#1152)

* fix: don't skip blocks on constraint error (#1154)

* fix: don't skip blocks on constraint error

* fix test

---------

Co-authored-by: Rashad Alston <[email protected]>

* Adding resources to helm chart (#1160)

* Update --replace-indexer and add --remove-data (#1146)

* remove debug info message (#1163)

* docs: update non-book docs (#1161)

* docs: update non-book docs

* updates

* markdownrc

* update contributing.md

* update release schedule

* update example readmes

---------

Co-authored-by: Rashad Alston <[email protected]>

* Fix incorrect schema digest (#1165)

* forc index deploy: register correct schema

* bugfix: we are removing the schema and registering it again

* log registered asset version

* add docs CI (#1158)

* enhancement: implement many-to-many relationships (#1140)

* enhancement: impl m2m inserts

* update implementation

* get the explorer working

* update native exec

* cleanup + updates

* get union types working

* use multiple queries

* rebase origin/develop

* fix test

---------

Co-authored-by: Rashad Alston <[email protected]>

* chore: improve UX of `forc index` plugin commands (#1142)

* Remove forc index new

* Allow for optional namespace in forc index init

* Remove profile and target flags from forc index build; change release bool to debug

* Remove service check from forc index check

* Move service check into forc index status

* Cleanup

* Remove short arg collision from forc index postgres

* Fix CI

* Replace forc_index_init with forc_index_new

* Adjust tests and documentation

* Address feedback; clean up some other things

* Address everything for real this time

* ci: streamline develop <> master merges (#1166)

* ci: use new formatter + fix master<>develop merging  (#1169)

fix: new ci formatting + fix master<>develop merge

Co-authored-by: Rashad Alston <[email protected]>

* v0.19.0 (#1172)

Co-authored-by: Rashad Alston <[email protected]>

---------

Co-authored-by: Rashad Alston <[email protected]>
Co-authored-by: Alexander <[email protected]>
Co-authored-by: JC <[email protected]>
Co-authored-by: roy_fuel <[email protected]>
Co-authored-by: Maciej Woś <[email protected]>
Co-authored-by: Sarah Schwartz <[email protected]>
@ra0x3 ra0x3 mentioned this pull request Aug 2, 2023
7 tasks
ra0x3 added a commit that referenced this pull request Aug 2, 2023
master <> develop (#1177)

* fix: add sql endpoint auth + make `run_query` fail gracefully (#1136)

* fix: add sql endpoint auth

* retrigger ci?

---------



* chore: switch to manual sqlx query logging (#1138)

* chore: switch to manual sqlx query logging

* fix test

* uat

* add rustdoc

---------



* fix: update readme (#1141)

* enhancement: make `NODE_BLOCK_PAGE_SIZE` configurable (#1147)

* Replace blocking `reqwest` usage with async (#1148)

* Revert "Replace blocking `reqwest` usage with async" (#1151)

Revert "Replace blocking `reqwest` usage with async (#1148)"

This reverts commit 19dbf2a.

* docs: adjust docs to include `--block-page-size` on start commands (#1153)

Adjust docs for start commands

* Replace blocking `reqwest` usage with async (#1152)

* fix: don't skip blocks on constraint error (#1154)

* fix: don't skip blocks on constraint error

* fix test

---------



* Adding resources to helm chart (#1160)

* Update --replace-indexer and add --remove-data (#1146)

* remove debug info message (#1163)

* docs: update non-book docs (#1161)

* docs: update non-book docs

* updates

* markdownrc

* update contributing.md

* update release schedule

* update example readmes

---------



* Fix incorrect schema digest (#1165)

* forc index deploy: register correct schema

* bugfix: we are removing the schema and registering it again

* log registered asset version

* add docs CI (#1158)

* enhancement: implement many-to-many relationships (#1140)

* enhancement: impl m2m inserts

* update implementation

* get the explorer working

* update native exec

* cleanup + updates

* get union types working

* use multiple queries

* rebase origin/develop

* fix test

---------



* chore: improve UX of `forc index` plugin commands (#1142)

* Remove forc index new

* Allow for optional namespace in forc index init

* Remove profile and target flags from forc index build; change release bool to debug

* Remove service check from forc index check

* Move service check into forc index status

* Cleanup

* Remove short arg collision from forc index postgres

* Fix CI

* Replace forc_index_init with forc_index_new

* Adjust tests and documentation

* Address feedback; clean up some other things

* Address everything for real this time

* ci: streamline develop <> master merges (#1166)

* ci: use new formatter + fix master<>develop merging  (#1169)

fix: new ci formatting + fix master<>develop merge



* v0.19.0 (#1172)



---------

Co-authored-by: Rashad Alston <[email protected]>
Co-authored-by: Alexander <[email protected]>
Co-authored-by: JC <[email protected]>
Co-authored-by: roy_fuel <[email protected]>
Co-authored-by: Maciej Woś <[email protected]>
Co-authored-by: Sarah Schwartz <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Streamline master <> develop and develop <> master merges on CI
2 participants