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

ci: merge staging to master #549

Merged
merged 127 commits into from
Oct 10, 2023
Merged

ci: merge staging to master #549

merged 127 commits into from
Oct 10, 2023

Conversation

MatrixAI-Bot
Copy link
Member

This is an automatic PR generated by the pipeline CI/CD. This will be automatically fast-forward merged if successful.

@MatrixAI-Bot
Copy link
Member Author

Pipeline Attempt on 962916672 for 75df917

https://gitlab.com/MatrixAI/open-source/Polykey/-/pipelines/962916672

@MatrixAI-Bot MatrixAI-Bot self-assigned this Aug 11, 2023
@ghost
Copy link

ghost commented Aug 11, 2023 •
edited by ghost
Loading

👇 Click on the image for a new way to code review

Review these changes using an interactive CodeSee Map

Legend

CodeSee Map legend

@MatrixAI-Bot
Copy link
Member Author

Pipeline Attempt on 962982993 for 7c56b5a

https://gitlab.com/MatrixAI/open-source/Polykey/-/pipelines/962982993

@MatrixAI-Bot
Copy link
Member Author

Pipeline Attempt on 962982985 for 6753e65

https://gitlab.com/MatrixAI/open-source/Polykey/-/pipelines/962982985

@MatrixAI-Bot
Copy link
Member Author

Pipeline Succeeded on 962982993 for 7c56b5a

https://gitlab.com/MatrixAI/open-source/Polykey/-/pipelines/962982993

@MatrixAI-Bot
Copy link
Member Author

Pipeline Attempt on 967804107 for 4c02f7a

https://gitlab.com/MatrixAI/open-source/Polykey/-/pipelines/967804107

@MatrixAI-Bot
Copy link
Member Author

Pipeline Attempt on 969073117 for a4443c7

https://gitlab.com/MatrixAI/open-source/Polykey/-/pipelines/969073117

@MatrixAI-Bot
Copy link
Member Author

Pipeline Succeeded on 969073117 for a4443c7

https://gitlab.com/MatrixAI/open-source/Polykey/-/pipelines/969073117

@MatrixAI-Bot
Copy link
Member Author

Pipeline Attempt on 971905600 for d16f601

https://gitlab.com/MatrixAI/open-source/Polykey/-/pipelines/971905600

@MatrixAI-Bot
Copy link
Member Author

Pipeline Attempt on 971917641 for 6fc7b80

https://gitlab.com/MatrixAI/open-source/Polykey/-/pipelines/971917641

@MatrixAI-Bot
Copy link
Member Author

Pipeline Attempt on 972359705 for 0025336

https://gitlab.com/MatrixAI/open-source/Polykey/-/pipelines/972359705

@MatrixAI-Bot
Copy link
Member Author

Pipeline Succeeded on 972359705 for 0025336

https://gitlab.com/MatrixAI/open-source/Polykey/-/pipelines/972359705

@MatrixAI-Bot
Copy link
Member Author

Pipeline Attempt on 1006485084 for 8dd41f7

https://gitlab.com/MatrixAI/open-source/Polykey/-/pipelines/1006485084

@MatrixAI-Bot
Copy link
Member Author

Pipeline Attempt on 1025020649 for 9d36416

https://gitlab.com/MatrixAI/open-source/Polykey/-/pipelines/1025020649

@CMCDragonkai
Copy link
Member

@tegefaulkes do you notice that there is alot of branch conflicts between staging and master.

image

Where did this all come from?

CMCDragonkai and others added 14 commits October 5, 2023 06:14
@CMCDragonkai
fix: migrated nodemon to Polykey-CLI
d6c354c
@CMCDragonkai
chore: re-ordered dependencies
cd1374c
@CMCDragonkai
fix: migrated utils.nix to Polykey-CLI
cab363e
@CMCDragonkai
feat(ids): added createNodeIdGenerator, encodeNodeIdString, `deco…
3df8b5c 
…deNodeIdString`
@CMCDragonkai
chore: removed gestalt type comments, these are no longer used becaus…
510e4e9 
…e since adopting tuple tagged unions
@tegefaulkes @CMCDragonkai
feat: NodeConnection can now wrap existing QUICConnections
2d2d5e1 
* Related #527

[ci skip]
@tegefaulkes @CMCDragonkai
feat: moved QUICServer into NodeConnectionManager
ed92634 
* Related #527

[ci skip]
@tegefaulkes @CMCDragonkai
feat: replaced uws with ws
89eb2b9 
* Related #540

[ci skip]
@tegefaulkes @CMCDragonkai
feat: added reverse response message to raw duplex streams
abb4d6c
@tegefaulkes @CMCDragonkai
fix: fixing up vaults agent handlers
2317a41
@CMCDragonkai
deps: removed commander, tslib, tsyringe, @types/nexpect
ab537bb
@CMCDragonkai
chore: added Amy Yan as a contributor
f7dec7d
@CMCDragonkai
feat: export everything in index.ts
86ea6ec
@CMCDragonkai
fix: fixed up network and NodeConnectionManager config
7ebed1b 
[ci skip]
@tegefaulkes
tests: moved and fixed agent handler tests
59cd2d8 
[ci skip]
@tegefaulkes
tests: fix for vaults cloning and pull problem
3888b36 
[ci skip]
@tegefaulkes
tests: removed unneeded test for webcrypto
4c90793 
[ci skip]
@tegefaulkes
tests: fixed IdentitiesManager test
4b9a259 
[ci skip]
@tegefaulkes
tests: general fixes to tests.
7578317 
[ci skip]
@tegefaulkes
tests: final test cleaning
1e78d78 
[ci skip]
@tegefaulkes
Merge pull request #562 from MatrixAI/feature-test-fixes
8faddb0 
Fixing `Polykey` and all tests for release
@tegefaulkes
tests: small fixes
68c5e70 
[ci skip]
@tegefaulkes
lint: lintfix
5df5929 
[ci skip]
@tegefaulkes
test: fixing up tests
d8b96a3
@tegefaulkes
test: small fix
280a40b 
[ci skip]
@tegefaulkes
dep: updating @matrixai/rpc to ^0.2.0
fbcfb1d 
[ci skip]
@tegefaulkes
fix: fixes for tests
de572c7 
All but 1 test fixed now.

[ci skip]
@tegefaulkes
dep: updated @matrixai/ws to ^1.1.5
9619d9f 
[ci skip]
@tegefaulkes
tests: fixed last test
c2a3f83 
[ci skip]
@tegefaulkes
fix: small fix to authenticationMiddleware.ts
b03f894
@tegefaulkes
fix: fixed up js-rpc imports
131475d
@tegefaulkes
fix: fixed up vaultManager imports
c16e562
@tegefaulkes
fix: review fixes
dd353a3 
Fixed idGen usage in `PolykeyClient` and imports in `PolykeyAgent`
@tegefaulkes
Merge pull request #560 from MatrixAI/feature-client-consolidation
3058507 
Consolidating `ClientService` and js-ws and js-rpc integration
@MatrixAI-Bot
Copy link
Member Author

Pipeline Attempt on 1031558225 for 3058507

https://gitlab.com/MatrixAI/open-source/Polykey/-/pipelines/1031558225

@CMCDragonkai
Copy link
Member

It's time to to get this staging passing CI to merge to master.

@MatrixAI-Bot
Copy link
Member Author

Pipeline Attempt on 1031571973 for d238645

https://gitlab.com/MatrixAI/open-source/Polykey/-/pipelines/1031571973

@MatrixAI-Bot
Copy link
Member Author

Pipeline Attempt on 1031659123 for 9622889

https://gitlab.com/MatrixAI/open-source/Polykey/-/pipelines/1031659123

@MatrixAI-Bot
Copy link
Member Author

Pipeline Succeeded on 1031659123 for 9622889

https://gitlab.com/MatrixAI/open-source/Polykey/-/pipelines/1031659123

@MatrixAI-Bot MatrixAI-Bot merged commit 9622889 into master Oct 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@MatrixAI-Bot MatrixAI-Bot

Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@MatrixAI-Bot @CMCDragonkai @tegefaulkes @amydevs @addievo